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

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

Merge "Add demangling of function name." am: 6452b903 

am: e10835f2

Change-Id: Iddb8a90281570eeca52e54a63ef36eede550e3fc
parents c323791e e10835f2

libbacktrace/UnwindStack.cpp

+4 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#endif



#include <backtrace/Backtrace.h>

#include <demangle.h>

#include <unwindstack/Elf.h>

#include <unwindstack/MapInfo.h>

#include <unwindstack/Maps.h>
@@ -110,7 +111,9 @@ static bool Unwind(pid_t pid, unwindstack::Memory* memory, unwindstack::Regs* re 
      frame->map.name = map_info->name;



      uint64_t func_offset = 0;

      if (!elf->GetFunctionName(adjusted_rel_pc, &frame->func_name, &func_offset)) {

      if (elf->GetFunctionName(adjusted_rel_pc, &frame->func_name, &func_offset)) {

        frame->func_name = demangle(frame->func_name.c_str());

      } else {

        frame->func_name = "";

      }

      frame->func_offset = func_offset;