Remove troublesome libiberty dependency by using __cxa_demangle instead of cplus_demangle. (redux)

Bug #232763 r=dbaron sr=brendan


git-svn-id: svn://10.0.0.236/trunk@152657 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/tools/trace-malloc/lib/Makefile.in

@@ -33,11 +33,12 @@ DEFFILE		= $(srcdir)/tm.def
 
 REQUIRES	= xpcom
 
-CSRCS            = \
+CSRCS		= \
 		nsTraceMalloc.c \
 		$(NULL)
 
 CPPSRCS		= \
+		nsDemangle.cpp \
 		nsTypeInfo.cpp \
 		$(NULL)
 
@@ -45,10 +46,6 @@ EXPORTS         = nsTraceMalloc.h
 
 EXTRA_DSO_LDOPTS = $(NSPR_LIBS)
 
-ifdef MOZ_DEMANGLE_SYMBOLS
-EXTRA_DSO_LDOPTS += -liberty
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS		+= nsDebugHelpWin32.cpp nsWinTraceMalloc.cpp nsStackFrameWin.cpp
 EXTRA_DSO_LDOPTS += $(XPCOM_LIBS)

mozilla/tools/trace-malloc/lib/nsDemangle.cpp

@@ -0,0 +1,44 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is trace-malloc/nsDemangle.cpp 
+ *
+ * The Initial Developer of the Original Code is The Mozilla Foundation.
+ * Portions created by the Foundation are
+ * Copyright (C) 2004 The Mozilla Foundation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU Public License (the "GPL"), in which case the
+ * provisions of the GPL are applicable instead of those above.
+ * If you wish to allow use of your version of this file only
+ * under the terms of the GPL and not to allow others to use your
+ * version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL.  If you do not delete
+ * the provisions above, a recipient may use your version of this
+ * file under either the MPL or the GPL.
+ */
+#ifdef MOZ_DEMANGLE_SYMBOLS
+
+#include <cxxabi.h>
+#include <stdlib.h>
+
+extern "C" char *nsDemangle(const char *symbol);
+
+char *nsDemangle(const char *symbol) {
+    return  abi::__cxa_demangle(symbol, 0, 0, 0);
+}
+
+#endif

mozilla/tools/trace-malloc/lib/nsTraceMalloc.c

@@ -78,13 +78,9 @@
 #define WRITE_FLAGS "w"
 
 #ifdef MOZ_DEMANGLE_SYMBOLS
-/* From libiberty, why aren't these in <libiberty.h> ? */
-extern char *cplus_demangle(const char *, int);
+char *nsDemangle(const char *);
 #endif
 
-#define DMGL_PARAMS     0x1
-#define DMGL_ANSI       0x2
-
 extern __ptr_t __libc_malloc(size_t);
 extern __ptr_t __libc_calloc(size_t, size_t);
 extern __ptr_t __libc_realloc(__ptr_t, size_t);
@@ -1197,8 +1193,7 @@ static callsite *calltree(uint32 *bp)
         method = NULL;
 #ifdef MOZ_DEMANGLE_SYMBOLS
         if (symbol && (len = strlen(symbol)) != 0) {
-            /* Attempt to demangle symbol in case it's a C++ mangled name. */
-            method = cplus_demangle(symbol, DMGL_PARAMS | DMGL_ANSI);
+            method = nsDemangle(symbol);
         }
 #endif
         if (!method) {