commit 7f7285657c06bbd48fae131afd5148fae4403f11
author David Srbecky <dsrbecky@google.com> Thu Feb 14 17:52:33 2019 +0000
committer David Srbecky <dsrbecky@google.com> Fri Feb 15 00:20:18 2019 +0000
tree 2de7fb7fbb2a59c67dc3dd06aaad49d5b924fed4
parent 768b15d9d1b6847910da4782672bdec79913a8b7

Fix DumpNativeStack function for traced methods. (part 2)

The alignment didn't work for thumb due to least significant bit set.

Bug: 123510633
Test: ./art/test.py -b -r -t 163
Change-Id: I173bdef1050c79a7431955034e3eb001d1efae05

runtime/native_stack_dump.cc

diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc
index 40bab0f..150fa78 100644
--- a/runtime/native_stack_dump.cc
+++ b/runtime/native_stack_dump.cc
@@ -301,10 +301,9 @@
       class_linker->IsQuickToInterpreterBridge(entry_point)) {
     return false;
   }
-  // The backtrace library might have heuristically subracted 1 from the pc,
-  // to pretend the pc is at the calling instruction.
-  DCHECK_ALIGNED(GetQuickInstrumentationExitPc(), sizeof(void*));
-  if (AlignUp(reinterpret_cast<void*>(pc), sizeof(void*)) == GetQuickInstrumentationExitPc()) {
+  // The backtrace library might have heuristically subracted instruction
+  // size from the pc, to pretend the pc is at the calling instruction.
+  if (reinterpret_cast<uintptr_t>(GetQuickInstrumentationExitPc()) - pc <= 4) {
     return false;
   }
   uintptr_t code = reinterpret_cast<uintptr_t>(EntryPointToCodePointer(entry_point));