diff options
author | Reid Kleckner <reid@kleckner.net> | 2014-01-03 19:56:20 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2014-01-03 19:56:20 +0000 |
commit | 077b7b14727c7110f9bdd799dfb6038def62c14d (patch) | |
tree | 284eb3e1585e7ba311cbb0a257ab49b5f08633d3 | |
parent | 4432a618e5b7c31ccdbe0efc0384a6c86c23c8d9 (diff) | |
download | llvm-077b7b14727c7110f9bdd799dfb6038def62c14d.tar.gz llvm-077b7b14727c7110f9bdd799dfb6038def62c14d.tar.bz2 llvm-077b7b14727c7110f9bdd799dfb6038def62c14d.tar.xz |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198445 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/MC/MCDisassembler/Disassembler.cpp | 1 | ||||
-rw-r--r-- | lib/MC/MCExternalSymbolizer.cpp | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/MC/MCDisassembler/Disassembler.cpp b/lib/MC/MCDisassembler/Disassembler.cpp index b0b8138e71..a0066c8885 100644 --- 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 dae3f522a4..ca368b27e1 100644 --- 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) { |