commit 9d01e7f723e987208319a006156380987c52bd0e
author The Android Automerger <android-build@google.com> Tue Mar 29 21:53:32 2016 -0700
committer The Android Automerger <android-build@google.com> Tue Mar 29 21:53:32 2016 -0700
tree 9a62c5ecca5cfee6e25590d12f1f1e45ce45c672
parent eac695cb518f60e864f04600a7bd51c1756fa826
parent 82b6c20e2aff691de6fe42b7b23de1276828c551

merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev

libbacktrace/Backtrace.cpp

diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp
index 42769ed..97f0ef4 100644
--- a/libbacktrace/Backtrace.cpp
+++ b/libbacktrace/Backtrace.cpp
@@ -54,8 +54,24 @@
   }
 }
 
+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;
 }