diff options
| author | 2015-07-13 17:02:30 +0000 | |
|---|---|---|
| committer | 2015-07-13 17:02:30 +0000 | |
| commit | ed6195a514e3253576af27ea9ba13038509d29ac (patch) | |
| tree | 79a2bbbab8cb36523056539d374d5d79e7e5ee4a /compiler/compiled_method.cc | |
| parent | f075879649686e59b7a9065c5a061dbfdcdfbecc (diff) | |
Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
Breaks again in some configurations I don't fully understand yet.
This reverts commit f075879649686e59b7a9065c5a061dbfdcdfbecc.
Change-Id: I0ac5533825e40b06462ee69b2740e4a96fb5c582
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); |