From 7c903fbacfaf449fb4f7a9fa2f1a1b6ba2db5330 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Tue, 22 Mar 2016 11:29:17 -0700 Subject: [PATCH] Don't demangle symbol names. Bug: http://b/27299236 Change-Id: I3a698c6d93e262fd78e743c1e6e946b054b9dcd1 --- libbacktrace/BacktraceImpl.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/libbacktrace/BacktraceImpl.cpp b/libbacktrace/BacktraceImpl.cpp index 405b042a5..469360075 100644 --- a/libbacktrace/BacktraceImpl.cpp +++ b/libbacktrace/BacktraceImpl.cpp @@ -60,24 +60,8 @@ bool Backtrace::Unwind(size_t num_ignore_frames, ucontext_t* ucontext) { return impl_->Unwind(num_ignore_frames, ucontext); } -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 = impl_->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; }