commit bfec3a315000e9fcfc8e2d3fcef25e747e3d2053
author Elliott Hughes <enh@google.com> Thu May 24 19:03:07 2012 -0700
committer Brian Carlstrom <bdc@google.com> Tue May 14 19:49:22 2013 -0700
tree 8e8c717620381e8f480470cce4517b54d57ed729
parent 7382459eca9632168b9d393bc77fb62bc21bb67a

Add basic Darwin support to libcorkscrew.

This might not seem like much, but it's already better than Mac OS'
backtrace(3).

(cherry picked from commit 2a46f6293f19b9d6100187fbd53088088e671b88)

Change-Id: I197b06c4c19f728ad6f194b2f473bd9dcd99b8a6

libcorkscrew/demangle.c

diff --git a/libcorkscrew/demangle.c b/libcorkscrew/demangle.c
index 54247cb..30ab1b0 100644
--- a/libcorkscrew/demangle.c
+++ b/libcorkscrew/demangle.c
@@ -25,6 +25,12 @@
                              int *status);
 
 char* demangle_symbol_name(const char* name) {
+#if defined(__APPLE__)
+    // Mac OS' __cxa_demangle demangles "f" as "float"; last tested on 10.7.
+    if (name != NULL && name[0] != '_') {
+        return NULL;
+    }
+#endif
     // __cxa_demangle handles NULL by returning NULL
     return __cxa_demangle(name, 0, 0, 0);
 }