commit a8c397317d6fce12d0ea1cac5482dbdd8b75fa6d
author Christopher Ferris <cferris@google.com> Mon Feb 12 08:46:19 2018 -0800
committer Christopher Ferris <cferris@google.com> Mon Feb 12 08:46:19 2018 -0800
tree ed78ac195df1a619702103205c1d6b0faf002df9
parent cd2fa1f43215b829bd4359bf7725daa220b08dbf

Clear dex pc to avoid duplicate frames.

Bug: 73228466

Test: Passes new unit tests, fails without change.
Change-Id: I3660bfd16cbf2d5cf96490ca7714bc5f97914884

libunwindstack/Unwinder.cpp

diff --git a/libunwindstack/Unwinder.cpp b/libunwindstack/Unwinder.cpp
index 644bfa8..dfd7b18 100644
--- a/libunwindstack/Unwinder.cpp
+++ b/libunwindstack/Unwinder.cpp
@@ -175,6 +175,8 @@
       if (regs_->dex_pc() != 0) {
         // Add a frame to represent the dex file.
         FillInDexFrame();
+        // Clear the dex pc so that we don't repeat this frame later.
+        regs_->set_dex_pc(0);
       }
 
       FillInFrame(map_info, elf, adjusted_rel_pc, adjusted_pc);