From 6920703c8eae0d90528ea09945e742582b6f8198 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 9 Jul 2015 18:15:19 +0100
Subject: 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
---
 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