diff options
| author | 2015-07-09 18:15:19 +0100 | |
|---|---|---|
| committer | 2015-07-10 18:05:19 +0100 | |
| commit | 6920703c8eae0d90528ea09945e742582b6f8198 (patch) | |
| tree | 31ed78caffdabf67cadaa07b1f5418f191a1d10e /compiler/compiled_method.cc | |
| parent | 7b3d3bc1a4ea7546e4743e90e695f4fc7ecadf3a (diff) | |
Make dex2dex return a CompiledMethod after quickening.
This is the starting piece of pushing more verification and
dex2dex data into an .oat file, to lower the dependency on verification
results at runtime.
Change-Id: I8e1b49a0207714bc5b84d1f606806718c5c7fb69
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); |