ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix frame numbering regression."

Browse source 
am: 91837d7efe

Change-Id: I406f8fc76b8097cd05aa44946c56774c3745e68f
This commit is contained in:
Christopher Ferris 2018-01-27 00:39:02 +00:00 • committed by android-build-merger
commit 7cbaae26ed
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libbacktrace/UnwindStack.cpp
View file

@ -139,8 +139,8 @@ bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
// #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 @@ bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
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;