diff options
| author | 2015-07-13 15:17:37 +0000 | |
|---|---|---|
| committer | 2015-07-13 15:17:38 +0000 | |
| commit | d562cb1347dbb673b6da830cac6fd9e0264d8b2b (patch) | |
| tree | 013caa3a276a022b4b58973ce02c16105f5a3323 /compiler/compiled_method.cc | |
| parent | af12baeacf33b46a8b399f19735613539382229a (diff) | |
| parent | f075879649686e59b7a9065c5a061dbfdcdfbecc (diff) | |
Merge "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
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); |