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

Merge "Add demangling of function name." am: 6452b9036d am: e10835f28a

Browse source 
am: 174f78e4cc

Change-Id: Ia0eb87f68222f6dbcb9324e693996345ca89cb8b
This commit is contained in:
Christopher Ferris 2017-08-12 16:17:19 +00:00 • committed by android-build-merger
commit aa2cab500c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libbacktrace/UnwindStack.cpp
View file

@ -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;