From ed6195a514e3253576af27ea9ba13038509d29ac Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Mon, 13 Jul 2015 17:02:30 +0000
Subject: 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
---
 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<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);
-- 
cgit v1.2.3-59-g8ed1b