[llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineInstr.h

[Evan Cheng]

Changes in directory llvm/include/llvm/CodeGen:

MachineInstr.h updated: 1.186 -> 1.187
---
Log message:

IsDef can only be accessed / set if operand is a register.


---
Diffs of the changes:  (+16 -11)

 MachineInstr.h |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)


Index: llvm/include/llvm/CodeGen/MachineInstr.h
diff -u llvm/include/llvm/CodeGen/MachineInstr.h:1.186 llvm/include/llvm/CodeGen/MachineInstr.h:1.187
--- llvm/include/llvm/CodeGen/MachineInstr.h:1.186	Tue Sep  5 13:56:02 2006
+++ llvm/include/llvm/CodeGen/MachineInstr.h	Tue Sep  5 15:20:04 2006
@@ -143,10 +143,22 @@
     return contents.SymbolName;
   }
 
-  bool isUse() const { return !IsDef; }
-  bool isDef() const { return IsDef; }
-  void setIsUse() { IsDef = false; }
-  void setIsDef() { IsDef = true; }
+  bool isUse() const { 
+    assert(isRegister() && "Wrong MachineOperand accessor");
+    return !IsDef;
+  }
+  bool isDef() const {
+    assert(isRegister() && "Wrong MachineOperand accessor");
+    return IsDef;
+  }
+  void setIsUse() {
+    assert(isRegister() && "Wrong MachineOperand accessor");
+    IsDef = false;
+  }
+  void setIsDef() {
+    assert(isRegister() && "Wrong MachineOperand accessor");
+    IsDef = true;
+  }
 
   /// getReg - Returns the register number.
   ///
@@ -295,7 +307,6 @@
   void addImmOperand(int64_t Val) {
     MachineOperand &Op = AddNewOperand();
     Op.opType = MachineOperand::MO_Immediate;
-    Op.IsDef = false;
     Op.contents.immedVal = Val;
     Op.offset = 0;
   }
@@ -303,7 +314,6 @@
   void addMachineBasicBlockOperand(MachineBasicBlock *MBB) {
     MachineOperand &Op = AddNewOperand();
     Op.opType = MachineOperand::MO_MachineBasicBlock;
-    Op.IsDef = false;
     Op.contents.MBB = MBB;
     Op.offset = 0;
   }
@@ -313,7 +323,6 @@
   void addFrameIndexOperand(unsigned Idx) {
     MachineOperand &Op = AddNewOperand();
     Op.opType = MachineOperand::MO_FrameIndex;
-    Op.IsDef = false;
     Op.contents.immedVal = Idx;
     Op.offset = 0;
   }
@@ -324,7 +333,6 @@
   void addConstantPoolIndexOperand(unsigned Idx, int Offset) {
     MachineOperand &Op = AddNewOperand();
     Op.opType = MachineOperand::MO_ConstantPoolIndex;
-    Op.IsDef = false;
     Op.contents.immedVal = Idx;
     Op.offset = Offset;
   }
@@ -335,7 +343,6 @@
   void addJumpTableIndexOperand(unsigned Idx) {
     MachineOperand &Op = AddNewOperand();
     Op.opType = MachineOperand::MO_JumpTableIndex;
-    Op.IsDef = false;
     Op.contents.immedVal = Idx;
     Op.offset = 0;
   }
@@ -343,7 +350,6 @@
   void addGlobalAddressOperand(GlobalValue *GV, int Offset) {
     MachineOperand &Op = AddNewOperand();
     Op.opType = MachineOperand::MO_GlobalAddress;
-    Op.IsDef = false;
     Op.contents.GV = GV;
     Op.offset = Offset;
   }
@@ -353,7 +359,6 @@
   void addExternalSymbolOperand(const char *SymName) {
     MachineOperand &Op = AddNewOperand();
     Op.opType = MachineOperand::MO_ExternalSymbol;
-    Op.IsDef = false;
     Op.contents.SymbolName = SymName;
     Op.offset = 0;
   }