commit a7dd0386f35c0ba4aef3f5b16bc84c6f4e2fc702
author Mathieu Chartier <mathieuc@google.com> Thu Nov 20 17:08:58 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Fri Nov 21 10:11:41 2014 -0800
tree 86bcc8c05fb3f868dbdae3dcacbf95de880d4d64
parent af6dad6cbb6685f92d7274f9e8c45baa98232c79

Fix oatdump to use OatHeader pointer size

Bug: 18473190
Change-Id: If505b4f62105899f4f1257d3bccda3e6eb0dcd7c

(cherry picked from commit c934e483ceabbd589422beea1fa35f5182ecfa99)

runtime/fault_handler.cc

diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc
index ab3ec62..835485c 100644
--- a/runtime/fault_handler.cc
+++ b/runtime/fault_handler.cc
@@ -360,7 +360,8 @@
   // at the return PC address.
   if (true || kIsDebugBuild) {
     VLOG(signals) << "looking for dex pc for return pc " << std::hex << return_pc;
-    const void* code = Runtime::Current()->GetInstrumentation()->GetQuickCodeFor(method_obj);
+    const void* code = Runtime::Current()->GetInstrumentation()->GetQuickCodeFor(method_obj,
+                                                                                 sizeof(void*));
     uint32_t sought_offset = return_pc - reinterpret_cast<uintptr_t>(code);
     VLOG(signals) << "pc offset: " << std::hex << sought_offset;
   }