Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee70b426 authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Fix frame numbering regression." am: 91837d7e am: 7cbaae26 

am: 70506823

Change-Id: I5550c613939e60ea4fbdbd887a8d04a91005791c
parents ea75bb94 70506823

libbacktrace/UnwindStack.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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;