summaryrefslogtreecommitdiff
path: root/compiler/compiled_method.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-07-13 17:02:42 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-07-13 17:02:44 +0000
commitf68c8545382925062da2b87169ca2b5314f0b431 (patch)
tree3d8bc5b5f09ec58135a883a7b7f2c96654b91f30 /compiler/compiled_method.cc
parent6fb5b1bdd5cfcc3c32fedd6539670b01b5cda9a2 (diff)
parented6195a514e3253576af27ea9ba13038509d29ac (diff)
Merge "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
Diffstat (limited to 'compiler/compiled_method.cc')
-rw-r--r--compiler/compiled_method.cc3
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);