Skip to content

Commit

Permalink
Revert "For disassembly when adding a symbolic operand that is a C++ …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
rnk committed Jan 3, 2014
1 parent 4432a61 commit 077b7b1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion lib/MC/MCDisassembler/Disassembler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
9 changes: 0 additions & 9 deletions lib/MC/MCExternalSymbolizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "llvm/MC/MCInst.h"
#include "llvm/Support/raw_ostream.h"
#include <cstring>
#include <cxxabi.h>

using namespace llvm;

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 077b7b1

Please sign in to comment.