commit 605a5fe91694d8a90c02fb01967081f55878a125
author David Srbecky <dsrbecky@google.com> Wed Apr 24 14:05:21 2019 +0100
committer David Srbecky <dsrbecky@google.com> Thu Apr 25 14:33:33 2019 +0000
tree 9c9365246d523920cc4c9180f648243408ac767e
parent 20d1c942c0e841920eac92f68c6d3e7f2a2135b4

jitzygote: Fix DCHECKs

Test: boot device with libartd and jitzygote
Bug: 119800099
Change-Id: I8f3a158cac22ce9ec221cd287bdddbb109c37b54

runtime/jit/jit_code_cache.cc

diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index 7dd4572..c22f4e3 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -1670,7 +1670,9 @@
     } else if (kIsDebugBuild) {
       // Sanity check that the profiling infos do not have a dangling entry point.
       for (ProfilingInfo* info : profiling_infos_) {
-        DCHECK(info->GetSavedEntryPoint() == nullptr);
+        DCHECK(!Runtime::Current()->IsZygote());
+        const void* entry_point = info->GetSavedEntryPoint();
+        DCHECK(entry_point == nullptr || IsInZygoteExecSpace(entry_point));
       }
     }