commit b1e3cdd601111e9a6f822cba3a31cf8ba0dc317e
author Christopher Ferris <cferris@google.com> Thu Aug 20 21:47:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 21:47:05 2015 +0000
tree 408ba75f11d6e3b939ba99d1a7de98c5c1141acb
parent 23833ff05055b7a184c68d914d6f5e543b89a642
parent 660b1031885a7517cb3fa5b49ec39e7f8f9a94fb

am 711e776c: Merge "Display the map offset for each frame."

* commit '711e776cc21d7a16a953abbb5734dbe8db3fd8f2':
  Display the map offset for each frame.

libbacktrace/Backtrace.cpp

diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp
index 128bb04..97f0ef4 100644
--- a/libbacktrace/Backtrace.cpp
+++ b/libbacktrace/Backtrace.cpp
@@ -102,6 +102,11 @@
   uintptr_t relative_pc = BacktraceMap::GetRelativePc(frame->map, frame->pc);
 
   std::string line(StringPrintf("#%02zu pc %" PRIPTR "  %s", frame->num, relative_pc, map_name));
+  // Special handling for non-zero offset maps, we need to print that
+  // information.
+  if (frame->map.offset != 0) {
+    line += " (offset " + StringPrintf("0x%" PRIxPTR, frame->map.offset) + ")";
+  }
   if (!frame->func_name.empty()) {
     line += " (" + frame->func_name;
     if (frame->func_offset) {

libbacktrace/backtrace_test.cpp

diff --git a/libbacktrace/backtrace_test.cpp b/libbacktrace/backtrace_test.cpp
index 6bd7529..9ebd639 100644
--- a/libbacktrace/backtrace_test.cpp
+++ b/libbacktrace/backtrace_test.cpp
@@ -825,6 +825,15 @@
   EXPECT_EQ("#01 pc 123456dc  MapFake (ProcFake+645)",
 #endif
             backtrace->FormatFrameData(&frame));
+
+  // Check a non-zero map offset.
+  frame.map.offset = 0x1000;
+#if defined(__LP64__)
+  EXPECT_EQ("#01 pc 00000000123456dc  MapFake (offset 0x1000) (ProcFake+645)",
+#else
+  EXPECT_EQ("#01 pc 123456dc  MapFake (offset 0x1000) (ProcFake+645)",
+#endif
+            backtrace->FormatFrameData(&frame));
 }
 
 struct map_test_t {