From 327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 13 Jul 2015 11:53:56 +0000 Subject: Revert "Make dex2dex return a CompiledMethod after quickening." Build failures on arm/arm64. This reverts commit 6920703c8eae0d90528ea09945e742582b6f8198. Change-Id: I0dd5426610150937dac6e4d9dd9aa759bdf7fca4 --- compiler/compiled_method.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/compiled_method.cc') 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* 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); -- cgit v1.2.3-59-g8ed1b