commit e4df5f5ab50939d4a36aa6c8076c7aa571fb56df
author Christopher Ferris <cferris@google.com> Mon Feb 12 13:24:18 2018 -0800
committer Christopher Ferris <cferris@google.com> Mon Feb 12 14:06:13 2018 -0800
tree 53c5d69585fdbc5bd314d95981ab3021e3c53a09
parent 73a2508dc4b2b6644e4904f013a6df5fff5e4569

Fix computation of pc.

Fix the case where a non-zero load bias or a non-zero elf offset causes
the pc to be set incorrectly.

Add unit tests for these cases.

Bug: 73172903

Test: Ran unit tests.
Test: Ran the unit tests from the simpleperf CL that detected the failure.
Change-Id: Id8802c00b34c66875edd4926a20c5fccd2bb7d72

libunwindstack/Unwinder.cpp

diff --git a/libunwindstack/Unwinder.cpp b/libunwindstack/Unwinder.cpp
index dfd7b18..5e32933 100644
--- a/libunwindstack/Unwinder.cpp
+++ b/libunwindstack/Unwinder.cpp
@@ -91,7 +91,7 @@
     return;
   }
 
-  frame->pc = map_info->start + adjusted_rel_pc;
+  frame->pc = map_info->start + adjusted_rel_pc - elf->GetLoadBias() - map_info->elf_offset;
   frame->map_name = map_info->name;
   frame->map_offset = map_info->offset;
   frame->map_start = map_info->start;