diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-07-13 11:56:00 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-07-13 14:53:03 +0100 |
| commit | f075879649686e59b7a9065c5a061dbfdcdfbecc (patch) | |
| tree | 4ecc8cec0a8c96e1115195041530c7fc5ca6a7ec /compiler/compiled_method.cc | |
| parent | f185fb365e9faf58428762bace96d7729ea5bdbc (diff) | |
| download | art-f075879649686e59b7a9065c5a061dbfdcdfbecc.tar.gz art-f075879649686e59b7a9065c5a061dbfdcdfbecc.tar.bz2 art-f075879649686e59b7a9065c5a061dbfdcdfbecc.zip | |
Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""
This reverts commit 327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9.
Change-Id: I0dc5d92e5d1ef98830fbd3c40ec59a93f9e0422d
Diffstat (limited to 'compiler/compiled_method.cc')
| -rw-r--r-- | compiler/compiled_method.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index d1acada6dd..f33db09677 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -27,8 +27,7 @@ CompiledCode::CompiledCode(CompilerDriver* compiler_driver, InstructionSet instr } void CompiledCode::SetCode(const ArrayRef<const uint8_t>* quick_code) { - if (quick_code != nullptr) { - CHECK(!quick_code->empty()); + if (quick_code != nullptr && !quick_code->empty()) { if (owns_code_array_) { // If we are supposed to own the code, don't deduplicate it. CHECK(quick_code_ == nullptr); |