commit 17965ed6ec29407599a0bcd4ea92532424294fed
author Sebastien Hertz <shertz@google.com> Fri Apr 04 15:59:53 2014 +0200
committer Sebastien Hertz <shertz@google.com> Fri Apr 04 17:01:21 2014 +0200
tree 1ad743cea5bdf37d7705bae19e5f08e8b687ec6f
parent 6f31ce382777d82952d019908866ff28ef3bbc76

Re-enable DEX-to-DEX compilation path

Bug: 13807032
Change-Id: I6de7adb81a0f955a93257b83db9ad689ebcd90ad

compiler/driver/compiler_driver.cc

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index b12b6a7..a241d51 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -1898,8 +1898,9 @@
       compiled_method = compiler_->Compile(
           *this, code_item, access_flags, invoke_type, class_def_idx,
           method_idx, class_loader, dex_file);
-    } else if (dex_to_dex_compilation_level != kDontDexToDexCompile) {
-      // TODO: add a mode to disable DEX-to-DEX compilation ?
+    }
+    if (compiled_method == nullptr && dex_to_dex_compilation_level != kDontDexToDexCompile) {
+      // TODO: add a command-line option to disable DEX-to-DEX compilation ?
       (*dex_to_dex_compiler_)(*this, code_item, access_flags,
                               invoke_type, class_def_idx,
                               method_idx, class_loader, dex_file,