Don't attach annotations to MCInst's. Instead, have the disassembler return, and the printer accept, an annotation string which can be passed through if the client cares about annotations.
llvm-svn: 139876
diff --git a/llvm/tools/llvm-objdump/MCFunction.cpp b/llvm/tools/llvm-objdump/MCFunction.cpp
index 418e9d0..5f16496 100644
--- a/llvm/tools/llvm-objdump/MCFunction.cpp
+++ b/llvm/tools/llvm-objdump/MCFunction.cpp
@@ -40,7 +40,7 @@
for (uint64_t Index = Start; Index < End; Index += Size) {
MCInst Inst;
- if (DisAsm->getInstruction(Inst, Size, Region, Index, DebugOut)) {
+ if (DisAsm->getInstruction(Inst, Size, Region, Index, DebugOut, nulls())) {
if (Ana->isBranch(Inst)) {
uint64_t targ = Ana->evaluateBranch(Inst, Index, Size);
// FIXME: Distinguish relocations from nop jumps.