diff options
author | 2015-07-13 11:54:08 +0000 | |
---|---|---|
committer | 2015-07-13 11:54:09 +0000 | |
commit | 5e094de24827292d8a13be2adbdcca54ae7d5ff0 (patch) | |
tree | 5ce17736c103a534fef86cbb81327b236d022a2a /compiler/compiled_method.cc | |
parent | 8bf1b5668257b50c220c05be5cb1105a9661afba (diff) | |
parent | 327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9 (diff) |
Merge "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, 2 insertions, 1 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index f33db09677..d1acada6dd 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -27,7 +27,8 @@ CompiledCode::CompiledCode(CompilerDriver* compiler_driver, InstructionSet instr } void CompiledCode::SetCode(const ArrayRef<const uint8_t>* quick_code) { - if (quick_code != nullptr && !quick_code->empty()) { + if (quick_code != nullptr) { + CHECK(!quick_code->empty()); if (owns_code_array_) { // If we are supposed to own the code, don't deduplicate it. CHECK(quick_code_ == nullptr); |