diff options
| author | 2015-07-13 11:07:18 +0000 | |
|---|---|---|
| committer | 2015-07-13 11:07:18 +0000 | |
| commit | 8bf1b5668257b50c220c05be5cb1105a9661afba (patch) | |
| tree | c24fc9e098e8830e456b434a1365e8f553574ebe /compiler/compiled_method.cc | |
| parent | d4da360082e8eadcd12b5030f42a9ba598332471 (diff) | |
| parent | 6920703c8eae0d90528ea09945e742582b6f8198 (diff) | |
Merge "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); |