[llvm] r198445 - Revert "For disassembly when adding a symbolic operand that is a C++ symbol name, also put the human readable name in a comment."

[Reid Kleckner]

Author: rnk
Date: Fri Jan  3 13:56:20 2014
New Revision: 198445

URL: http://llvm.org/viewvc/llvm-project?rev=198445&view=rev
Log:
Revert "For disassembly when adding a symbolic operand that is a C++ symbol name, also put the human readable name in a comment."

This reverts commit r198441.

This change doesn't build on Windows, and doesn't do the right thing on
Linux and other platforms that don't use a _Z prefix instead of __Z for
C++ names.

It also had no tests, so it wasn't clear how to fix it forward.

Modified:
    llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp
    llvm/trunk/lib/MC/MCExternalSymbolizer.cpp

Modified: llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp?rev=198445&r1=198444&r2=198445&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp Fri Jan  3 13:56:20 2014
@@ -298,7 +298,6 @@ size_t LLVMDisasmInstruction(LLVMDisasmC
       emitLatency(DC, Inst);
 
     emitComments(DC, FormattedOS);
-    OS.flush();
 
     assert(OutStringSize != 0 && "Output buffer cannot be zero size");
     size_t OutputSize = std::min(OutStringSize-1, InsnStr.size());

Modified: llvm/trunk/lib/MC/MCExternalSymbolizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExternalSymbolizer.cpp?rev=198445&r1=198444&r2=198445&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExternalSymbolizer.cpp (original)
+++ llvm/trunk/lib/MC/MCExternalSymbolizer.cpp Fri Jan  3 13:56:20 2014
@@ -13,7 +13,6 @@
 #include "llvm/MC/MCInst.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cstring>
-#include <cxxabi.h>
 
 using namespace llvm;
 
@@ -57,14 +56,6 @@ bool MCExternalSymbolizer::tryAddingSymb
     if (Name) {
       SymbolicOp.AddSymbol.Name = Name;
       SymbolicOp.AddSymbol.Present = true;
-      // If Name is a C++ symbol name put the human readable name in a comment.
-      if (strncmp(Name, "__Z", 3) == 0) {
-        char *demangled = abi::__cxa_demangle(Name + 1, 0, 0, 0);
-	if (demangled) {
-          cStream << demangled;
-          free(demangled);
-        }
-      }
     }
     // For branches always create an MCExpr so it gets printed as hex address.
     else if (IsBranch) {