llvm-mc: Switch MCInst to storing an MCExpr* instead of an MCValue.

Also, use MCInst::print instead of custom code in MCAsmPrinter.

llvm-svn: 80575

1 files changed, 4 insertions, 3 deletions

diff --git a/llvm/lib/MC/MCInst.cpp b/llvm/lib/MC/MCInst.cpp
index 469dc7975e5..ec061463b75 100644
--- a/llvm/lib/MC/MCInst.cpp
+++ b/llvm/lib/MC/MCInst.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCExpr.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
@@ -23,9 +24,9 @@ void MCOperand::print(raw_ostream &OS) const {
   else if (isMBBLabel())
     OS << "MBB:(" << getMBBLabelFunction() << ","
        << getMBBLabelBlock() << ")";
-  else if (isMCValue()) {
-    OS << "Value:(";
-    getMCValue().print(OS);
+  else if (isExpr()) {
+    OS << "Expr:(";
+    getExpr()->print(OS);
     OS << ")";
   } else
     OS << "UNDEFINED";