commit f9006ec9b6b16e955b29724e4ae05424e11389e0
author David Srbecky <dsrbecky@google.com> Thu Feb 01 14:49:14 2018 +0000
committer David Srbecky <dsrbecky@google.com> Thu Feb 01 14:51:57 2018 +0000
tree 4abc4e3afeb7c3cd88e3fe75357377aca6669072
parent c146c8f5c170b60e08dcbcad2b163366e4f0e99b

Fix symbol resolution within a dex file.

Fixes the ART 137-cfi test, currently failing on buildbot.

Test: testrunner.py -j40 --host --cdex-none -t 137 -b
Change-Id: I16a007b291702207bbd003fd1e78e8e5ced7cd68

libunwindstack/Unwinder.cpp

diff --git a/libunwindstack/Unwinder.cpp b/libunwindstack/Unwinder.cpp
index d22e1e8..db8278e 100644
--- a/libunwindstack/Unwinder.cpp
+++ b/libunwindstack/Unwinder.cpp
@@ -95,7 +95,8 @@
   }
 
 #if !defined(NO_LIBDEXFILE_SUPPORT)
-  dex_files_->GetMethodInformation(dex_offset, info, &frame->function_name, &frame->function_offset);
+  dex_files_->GetMethodInformation(dex_pc - dex_offset, dex_offset, info, &frame->function_name,
+                                   &frame->function_offset);
 #endif
 }