commit d32ce09761ed5c6ecdd95396d0d668f04ccffd44
author Andreas Gampe <agampe@google.com> Wed Nov 07 11:08:40 2018 -0800
committer Andreas Gampe <agampe@google.com> Tue Nov 13 10:23:16 2018 -0800
tree 28c16c8ef6d6562af6e9cf33522bcd7ca6fada1d
parent 57ee3473336912d89d7b9c2925dfbeab6eda3277

ART: Split Runtime::IsNativeDebuggable

Ensure that the main version cannot be called in the zygote.

Bug: 119063276
Test: m test-art-host
Test: device boots
Change-Id: Ic3d158d5d75fa6982411402f69062ac333b20798

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 67513f9..cc4f56c 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3112,7 +3112,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

runtime/runtime.h

diff --git a/runtime/runtime.h b/runtime/runtime.h
index be5b3c1..4bc16e2 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -650,6 +650,13 @@
   void DeoptimizeBootImage();
 
   bool IsNativeDebuggable() const {
+    CHECK(!is_zygote_ || IsAotCompiler());
+    return is_native_debuggable_;
+  }
+
+  // Note: prefer not to use this method, but the checked version above. The separation exists
+  //       as the runtime state may change for a zygote child.
+  bool IsNativeDebuggableZygoteOK() const {
     return is_native_debuggable_;
   }