commit 617b3a23390922be67c1b72e23c0d373149bb457
author David Srbecky <dsrbecky@google.com> Wed Apr 03 17:46:32 2019 +0100
committer David Srbecky <dsrbecky@google.com> Thu May 23 12:01:04 2019 +0000
tree c9d4bc1e92cb3a13f800dceb3dc5c97bf58c0dc2
parent a834549066b54d5c2d4a932a44093196db6d77a0

Add another missing entrypoint check for stack walk.

(cherry picked from commit 774232ae5a825ad4a366edc57081bff265e0ac32)

Bug: 132575193
Test: m -j40 cts && cts-tradefed run cts \
  --test android.jvmti.cts.JvmtiHostTest1927#testJvmti \
  --module CtsJvmtiRunTest1927HostTestCases
Merged-In: I68cd0e509e7c776ab4d67c83e6c3b06a4f6c0e60
Change-Id: Ia61caaca545810646fe3567f02beb4eca53b9a41

runtime/art_method.cc

diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index 7f3aa80..0890da8 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);