2 files changed, 30 insertions, 0 deletions
diff --git a/lib/MC/MCInst.cpp b/lib/MC/MCInst.cpp
index 4cb628b395..ec97acc554 100644
--- a/lib/MC/MCInst.cpp
+++ b/lib/MC/MCInst.cpp
@@ -41,6 +41,16 @@ void MCInst::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
     OS << " ";
     getOperand(i).print(OS, MAI);
   }
+
+  if (getNumAnnotations()) {
+    OS << " # Annots: ";
+    for (unsigned i = 0, e = getNumAnnotations(); i != e; ++i) {
+      OS << " \"";
+      OS << getAnnotation(i);
+      OS << '"';
+    }
+  }
+
   OS << ">";
 }
 
@@ -57,6 +67,17 @@ void MCInst::dump_pretty(raw_ostream &OS, const MCAsmInfo *MAI,
     OS << Separator;
     getOperand(i).print(OS, MAI);
   }
+
+  if (getNumAnnotations()) {
+    OS << " # Annots: ";
+    for (unsigned i = 0, e = getNumAnnotations(); i != e; ++i) {
+      OS << Separator;
+      OS << '"';
+      OS << getAnnotation(i);
+      OS << '"';
+    }
+  }
+
   OS << ">";
 }
 
diff --git a/lib/MC/MCInstPrinter.cpp b/lib/MC/MCInstPrinter.cpp
index 81a939ffaa..f0fa2cda4a 100644
--- a/lib/MC/MCInstPrinter.cpp
+++ b/lib/MC/MCInstPrinter.cpp
@@ -8,7 +8,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/MCInstPrinter.h"
+#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCInst.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
 MCInstPrinter::~MCInstPrinter() {
@@ -23,3 +26,9 @@ StringRef MCInstPrinter::getOpcodeName(unsigned Opcode) const {
 void MCInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const {
   assert(0 && "Target should implement this");
 }
+
+void MCInstPrinter::printAnnotations(const MCInst *MI, raw_ostream &OS) {
+  for (unsigned i = 0, e = MI->getNumAnnotations(); i != e; ++i) {
+    OS << MI->getAnnotation(i) << "\n";
+  }
+}