diff options
| author | 2019-04-03 17:46:32 +0100 | |
|---|---|---|
| committer | 2019-04-04 13:58:32 +0000 | |
| commit | 774232ae5a825ad4a366edc57081bff265e0ac32 (patch) | |
| tree | 60d4ca84fa7beb58ea297ca68eaf81af7136eaaa | |
| parent | 383f114f8d950f51eb2085ee5ea5375a2403cece (diff) | |
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
| -rw-r--r-- | runtime/art_method.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/art_method.cc b/runtime/art_method.cc index b9d514e5aa..c07efba9d6 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -593,7 +593,8 @@ const OatQuickMethodHeader* ArtMethod::GetOatQuickMethodHeader(uintptr_t pc) { // 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); |