From f075879649686e59b7a9065c5a061dbfdcdfbecc Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Mon, 13 Jul 2015 11:56:00 +0000
Subject: Revert "Revert "Make dex2dex return a CompiledMethod after
 quickening.""

This reverts commit 327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9.

Change-Id: I0dc5d92e5d1ef98830fbd3c40ec59a93f9e0422d
---
 compiler/compiled_method.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'compiler/compiled_method.cc')

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);
-- 
cgit v1.2.3-59-g8ed1b