commit 774232ae5a825ad4a366edc57081bff265e0ac32
author David Srbecky <dsrbecky@google.com> Wed Apr 03 17:46:32 2019 +0100
committer David Srbecky <dsrbecky@google.com> Thu Apr 04 13:58:32 2019 +0000
tree 60d4ca84fa7beb58ea297ca68eaf81af7136eaaa
parent 383f114f8d950f51eb2085ee5ea5375a2403cece

Add another missing entrypoint check for stack walk.

Test: m -j40 cts && cts-tradefed run cts \
  --test android.jvmti.cts.JvmtiHostTest1927#testJvmti \
  --module CtsJvmtiRunTest1927HostTestCases

Change-Id: I68cd0e509e7c776ab4d67c83e6c3b06a4f6c0e60

runtime/art_method.cc

diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index b9d514e..c07efba 100644
--- a/runtime/art_method.cc
+++ b/runtime/art_method.cc
@@ -593,7 +593,8 @@
   // Check whether the current entry point contains this pc.
   if (!class_linker->IsQuickGenericJniStub(existing_entry_point) &&
       !class_linker->IsQuickResolutionStub(existing_entry_point) &&
-      !class_linker->IsQuickToInterpreterBridge(existing_entry_point)) {
+      !class_linker->IsQuickToInterpreterBridge(existing_entry_point) &&
+      existing_entry_point != GetQuickInstrumentationEntryPoint()) {
     OatQuickMethodHeader* method_header =
         OatQuickMethodHeader::FromEntryPoint(existing_entry_point);