[llvm-commits] [compiler-rt] r163376 - /compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp

[Alexey Samsonov]

Author: samsonov
Date: Fri Sep  7 02:26:35 2012
New Revision: 163376

URL: http://llvm.org/viewvc/llvm-project?rev=163376&view=rev
Log:
[Sanitizer] add --demangle option to llvm-symbolizer (for now just assume that __cxa_demangle option is available)

Modified:
    compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp

Modified: compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp?rev=163376&r1=163375&r2=163376&view=diff
==============================================================================
--- compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp (original)
+++ compiler-rt/trunk/utils/llvm-symbolizer/llvm-symbolizer.cpp Fri Sep  7 02:26:35 2012
@@ -50,6 +50,10 @@
 PrintInlining("inlining", cl::init(true),
               cl::desc("Print all inlined frames for a given address"));
 
+static cl::opt<bool>
+Demangle("demangle", cl::init(true),
+         cl::desc("Demangle function names"));
+
 static StringRef ToolInvocationPath;
 
 static bool error(error_code ec) {
@@ -237,6 +241,10 @@
   return Info;
 }
 
+// Assume that __cxa_demangle is provided by libcxxabi.
+extern "C" char *__cxa_demangle(const char *mangled_name, char *output_buffer,
+                                size_t *length, int *status);
+
 static void printDILineInfo(DILineInfo LineInfo) {
   // By default, DILineInfo contains "<invalid>" for function/filename it
   // cannot fetch. We replace it to "??" to make our output closer to addr2line.
@@ -246,6 +254,15 @@
     string FunctionName = LineInfo.getFunctionName();
     if (FunctionName == kDILineInfoBadString)
       FunctionName = kSymbolizerBadString;
+    if (Demangle) {
+      int status = 0;
+      char *DemangledName = __cxa_demangle(
+          FunctionName.c_str(), 0, 0, &status);
+      if (status == 0) {
+        FunctionName = DemangledName;
+        free(DemangledName);
+      }
+    }
     outs() << FunctionName << "\n";
   }
   string Filename = LineInfo.getFileName();