Revert "For disassembly when adding a symbolic operand that is a C++ symbol name...

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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198445 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/MCDisassembler/Disassembler.cpp b/lib/MC/MCDisassembler/Disassembler.cpp
index b0b8138e7119428baad4b3cdebebc08314e71492..a0066c8885c55b677df66d265d0a8e0de72f3d18 100644 (file)
--- a/lib/MC/MCDisassembler/Disassembler.cpp
+++ b/lib/MC/MCDisassembler/Disassembler.cpp
@@ -298,7 +298,6 @@ size_t LLVMDisasmInstruction(LLVMDisasmContextRef DCR, uint8_t *Bytes,
       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());

diff --git a/lib/MC/MCExternalSymbolizer.cpp b/lib/MC/MCExternalSymbolizer.cpp
index dae3f522a4fbac8ed57caf3323477dd8c9cbf2b4..ca368b27e1958426f5f7db23f632d1fda1bcfaf7 100644 (file)
--- a/lib/MC/MCExternalSymbolizer.cpp
+++ b/lib/MC/MCExternalSymbolizer.cpp
@@ -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::tryAddingSymbolicOperand(MCInst &MI,
     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) {