commit a7524f6165c1598dc23ea95350dd81102c9d91c8
author Christopher Ferris <cferris@google.com> Fri Jan 26 14:26:13 2018 -0800
committer Christopher Ferris <cferris@google.com> Fri Jan 26 14:26:13 2018 -0800
tree 61fdab6a8e9220454f908c1c0ed320dff53d07c5
parent 9c7588d37485ca7046ff21947124204c4ad40b80

Fix frame numbering regression.

Test: All unit tests now pass.
Change-Id: I280dfbbed3f835c826788b80ff4abb22bea7dc59

libbacktrace/UnwindStack.cpp

diff --git a/libbacktrace/UnwindStack.cpp b/libbacktrace/UnwindStack.cpp
index c5dd45b..c5d498c 100644
--- a/libbacktrace/UnwindStack.cpp
+++ b/libbacktrace/UnwindStack.cpp
@@ -139,8 +139,8 @@
     //   #8 pc 0015fa20 core.vdex   java.util.Arrays.binarySearch+8
     //   #9 pc 0039a1ef libartd.so  art::interpreter::Execute+719
     if (frame->dex_pc != 0) {
-      backtrace_frame_data_t* dex_frame = &frames->at(cur_frame++);
-      dex_frame->num = cur_frame;
+      backtrace_frame_data_t* dex_frame = &frames->at(cur_frame);
+      dex_frame->num = cur_frame++;
       dex_frame->pc = frame->dex_pc;
       dex_frame->rel_pc = frame->dex_pc;
       dex_frame->sp = frame->sp;
@@ -149,9 +149,9 @@
       FillInDexFrame(stack_map, frame->dex_pc, dex_frame);
     }
 
-    backtrace_frame_data_t* back_frame = &frames->at(cur_frame++);
+    backtrace_frame_data_t* back_frame = &frames->at(cur_frame);
 
-    back_frame->num = cur_frame;
+    back_frame->num = cur_frame++;
 
     back_frame->rel_pc = frame->rel_pc;
     back_frame->pc = frame->pc;