eliminate the "MBBLabel" MCOperand type, and just use a MCSymbol for

[oota-llvm.git] / include / llvm / MC / MCInst.h

diff --git a/include/llvm/MC/MCInst.h b/include/llvm/MC/MCInst.h
index 10a896a668801cfcc05ccfe9f693cb98b2799f79..0fc4d186b975cd03e695f0bd6f6148deb438ee28 100644 (file)
--- a/include/llvm/MC/MCInst.h
+++ b/include/llvm/MC/MCInst.h
@@ -31,7 +31,6 @@ class MCOperand {
     kInvalid,                 ///< Uninitialized.
     kRegister,                ///< Register operand.
     kImmediate,               ///< Immediate operand.
-    kMBBLabel,                ///< Basic block label.
     kExpr                     ///< Relocatable immediate operand.
   };
   unsigned char Kind;
@@ -40,10 +39,6 @@ class MCOperand {
     unsigned RegVal;
     int64_t ImmVal;
     const MCExpr *ExprVal;
-    struct {
-      unsigned FunctionNo;
-      unsigned BlockNo;
-    } MBBLabel;
   };
 public:
   
@@ -53,7 +48,6 @@ public:
   bool isValid() const { return Kind != kInvalid; }
   bool isReg() const { return Kind == kRegister; }
   bool isImm() const { return Kind == kImmediate; }
-  bool isMBBLabel() const { return Kind == kMBBLabel; }
   bool isExpr() const { return Kind == kExpr; }
   
   /// getReg - Returns the register number.
@@ -77,15 +71,6 @@ public:
     ImmVal = Val;
   }
   
-  unsigned getMBBLabelFunction() const {
-    assert(isMBBLabel() && "This is not a machine basic block");
-    return MBBLabel.FunctionNo; 
-  }
-  unsigned getMBBLabelBlock() const {
-    assert(isMBBLabel() && "This is not a machine basic block");
-    return MBBLabel.BlockNo; 
-  }
-
   const MCExpr *getExpr() const {
     assert(isExpr() && "This is not an expression");
     return ExprVal;
@@ -107,13 +92,6 @@ public:
     Op.ImmVal = Val;
     return Op;
   }
-  static MCOperand CreateMBBLabel(unsigned Fn, unsigned MBB) {
-    MCOperand Op;
-    Op.Kind = kMBBLabel;
-    Op.MBBLabel.FunctionNo = Fn;
-    Op.MBBLabel.BlockNo = MBB;
-    return Op;
-  }
   static MCOperand CreateExpr(const MCExpr *Val) {
     MCOperand Op;
     Op.Kind = kExpr;