commit bb7207376b186d8df9afcbb9df6011f8a4ef7ab5
author David Srbecky <dsrbecky@google.com> Tue Jan 29 16:54:47 2019 +0000
committer David Srbecky <dsrbecky@google.com> Wed Jan 30 14:53:06 2019 +0000
tree 9b196da040792c08849fc64483dc16fa2feef787
parent c0f797328e986dcdded1ba5e413ae01c24fedef9

Fix DumpNativeStack function for trampolines.

Trampolines are not preceded by OatQuickMethodHeader,
so we should not be trying to read it in those cases.

Bug: 123510633
Test: Added temporary checks when reading the header.
Test: test.py -b --host -r -t 061 -t 064
Change-Id: I3507efcb1ac342fc3d65dd4d38408d9a18f1877a

runtime/native_stack_dump.cc

diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc
index 88adad0..11f4203 100644
--- a/runtime/native_stack_dump.cc
+++ b/runtime/native_stack_dump.cc
@@ -50,7 +50,9 @@
 #include "base/os.h"
 #include "base/unix_file/fd_file.h"
 #include "base/utils.h"
+#include "class_linker.h"
 #include "oat_quick_method_header.h"
+#include "runtime.h"
 #include "thread-current-inl.h"
 
 #endif
@@ -274,11 +276,17 @@
 }
 
 static bool PcIsWithinQuickCode(ArtMethod* method, uintptr_t pc) NO_THREAD_SAFETY_ANALYSIS {
-  uintptr_t code = reinterpret_cast<uintptr_t>(EntryPointToCodePointer(
-      method->GetEntryPointFromQuickCompiledCode()));
-  if (code == 0) {
+  const void* entry_point = method->GetEntryPointFromQuickCompiledCode();
+  if (entry_point == nullptr) {
     return pc == 0;
   }
+  ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
+  if (class_linker->IsQuickGenericJniStub(entry_point) ||
+      class_linker->IsQuickResolutionStub(entry_point) ||
+      class_linker->IsQuickToInterpreterBridge(entry_point)) {
+    return false;
+  }
+  uintptr_t code = reinterpret_cast<uintptr_t>(EntryPointToCodePointer(entry_point));
   uintptr_t code_size = reinterpret_cast<const OatQuickMethodHeader*>(code)[-1].GetCodeSize();
   return code <= pc && pc <= (code + code_size);
 }