<div dir="ltr">Test case?</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Oct 16, 2013 at 2:54 AM, Alexey Samsonov <span dir="ltr"><<a href="mailto:samsonov@google.com" target="_blank">samsonov@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Wed Oct 16 04:54:49 2013<br>
New Revision: 192781<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=192781&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=192781&view=rev</a><br>
Log:<br>
llvm-symbolizer: don't always run demangler on global object names<br>
<br>
Modified:<br>
    llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp<br>
    llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h<br>
<br>
Modified: llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp?rev=192781&r1=192780&r2=192781&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp?rev=192781&r1=192780&r2=192781&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp (original)<br>
+++ llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.cpp Wed Oct 16 04:54:49 2013<br>
@@ -196,7 +196,7 @@ std::string LLVMSymbolizer::symbolizeDat<br>
   if (Opts.UseSymbolTable) {<br>
     if (ModuleInfo *Info = getOrCreateModuleInfo(ModuleName)) {<br>
       if (Info->symbolizeData(ModuleOffset, Name, Start, Size) && Opts.Demangle)<br>
-        Name = DemangleName(Name);<br>
+        Name = DemangleGlobalName(Name);<br>
     }<br>
   }<br>
   std::stringstream ss;<br>
@@ -436,5 +436,11 @@ std::string LLVMSymbolizer::DemangleName<br>
 #endif<br>
 }<br>
<br>
+std::string LLVMSymbolizer::DemangleGlobalName(const std::string &Name) {<br>
+  // We can spoil names of globals with C linkage, so use an heuristic<br>
+  // approach to check if the name should be demangled.<br>
+  return (Name.substr(0, 2) == "_Z") ? DemangleName(Name) : Name;<br>
+}<br>
+<br>
 } // namespace symbolize<br>
 } // namespace llvm<br>
<br>
Modified: llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h?rev=192781&r1=192780&r2=192781&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h?rev=192781&r1=192780&r2=192781&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h (original)<br>
+++ llvm/trunk/tools/llvm-symbolizer/LLVMSymbolize.h Wed Oct 16 04:54:49 2013<br>
@@ -71,6 +71,7 @@ private:<br>
   ObjectFile *getObjectFileFromBinary(Binary *Bin, const std::string &ArchName);<br>
<br>
   std::string printDILineInfo(DILineInfo LineInfo) const;<br>
+  static std::string DemangleGlobalName(const std::string &Name);<br>
<br>
   // Owns all the parsed binaries and object files.<br>
   SmallVector<Binary*, 4> ParsedBinariesAndObjects;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>