diff options
| author | Josh Gao <jmgao@google.com> | 2016-03-23 20:58:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-23 20:58:50 +0000 |
| commit | c7d8777d5659158c12bb3eb927d1a23c7c5c643d (patch) | |
| tree | 393c1f337a3cd9197f40b3e4f0b049536f0857b9 /libbacktrace | |
| parent | d8bf1aaabedd0d8ce77a7dede10c5e47e99efae1 (diff) | |
| parent | 05e1e1fb4100bb52fab2af41dc6caaf31c527819 (diff) | |
| download | system_core-c7d8777d5659158c12bb3eb927d1a23c7c5c643d.tar.gz system_core-c7d8777d5659158c12bb3eb927d1a23c7c5c643d.tar.bz2 system_core-c7d8777d5659158c12bb3eb927d1a23c7c5c643d.zip | |
Don\'t demangle symbol names. am: fbbc744 am: 0edda64 am: 9bf0b81 am: 0fb3191
am: 05e1e1f
* commit '05e1e1fb4100bb52fab2af41dc6caaf31c527819':
Don't demangle symbol names.
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/Backtrace.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp index 995abc02c..0d2e11bdf 100644 --- a/libbacktrace/Backtrace.cpp +++ b/libbacktrace/Backtrace.cpp @@ -52,24 +52,8 @@ Backtrace::~Backtrace() { } } -extern "C" char* __cxa_demangle(const char* mangled, char* buf, size_t* len, - int* status); - std::string Backtrace::GetFunctionName(uintptr_t pc, uintptr_t* offset) { std::string func_name = GetFunctionNameRaw(pc, offset); - if (!func_name.empty()) { -#if defined(__APPLE__) - // Mac OS' __cxa_demangle demangles "f" as "float"; last tested on 10.7. - if (func_name[0] != '_') { - return func_name; - } -#endif - char* name = __cxa_demangle(func_name.c_str(), 0, 0, 0); - if (name) { - func_name = name; - free(name); - } - } return func_name; } |