commit 763cd98161424cf19af2f113a6802f04860dcd6e
author Andreas Gampe <agampe@google.com> Mon Nov 26 18:21:45 2018 +0000
committer Andreas Gampe <agampe@google.com> Mon Nov 26 18:21:45 2018 +0000
tree bfb50d986ad25030ecfde9b3a4e1ffd8983e30f6
parent 7a2c7c2f7062d9fef21b72ff9c10ca8ef863eb8b

Revert "Refactor code around JIT creation."

This reverts commit 7a2c7c2f7062d9fef21b72ff9c10ca8ef863eb8b.

Reason for revert: Breaks boot in debug mode

Bug: 119800099
Change-Id: I6d015b04c480f76824ead936238cbf49b164b7e3
Test: N/A

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index bcc05c7..ce7dfaf 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3145,7 +3145,7 @@
     return (jit == nullptr) || !jit->GetCodeCache()->ContainsPc(quick_code);
   }
 
-  if (runtime->IsNativeDebuggable()) {
+  if (runtime->IsNativeDebuggableZygoteOK()) {
     DCHECK(runtime->UseJitCompilation() && runtime->GetJit()->JitAtFirstUse());
     // If we are doing native debugging, ignore application's AOT code,
     // since we want to JIT it (at first use) with extra stackmaps for native