commit 5e7389f1983821dbd7ef9dc2b55a41e88daf23be
author Christopher Ferris <cferris@google.com> Sat Jan 27 00:39:02 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 27 00:39:02 2018 +0000
tree a6c7780de5996b8c7e3ea32bb503b1219b7703a7
parent e46c0b3cdc25c6d05488122d98f2c52578cc3ce9
parent 06ec602aa6b91d08b22564d5c5086d6536dc3d7e

Merge "Fix frame numbering regression."
am: 91837d7efe

Change-Id: I406f8fc76b8097cd05aa44946c56774c3745e68f

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;