[llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp VirtRegMap.cpp

[Evan Cheng]

Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.201 -> 1.202
VirtRegMap.cpp updated: 1.83 -> 1.84
---
Log message:

MI keeps a ptr of TargetInstrDescriptor, use it.

---
Diffs of the changes:  (+5 -3)

 LiveIntervalAnalysis.cpp |    3 ++-
 VirtRegMap.cpp           |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.201 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.202
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.201	Wed Dec  6 11:46:31 2006
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Wed Dec  6 19:19:37 2006
@@ -434,7 +434,8 @@
       for (unsigned j = i+1; j < e; ++j) {
         MachineOperand &MO2 = MI->getOperand(j);
         if (MO2.isRegister() && MO2.isUse() && MO2.getReg() == Reg &&
-            TII->getOperandConstraint(MI->getOpcode(),j,TOI::TIED_TO) == (int)i)
+            MI->getInstrDescriptor()->
+            getOperandConstraint(j, TOI::TIED_TO) == (int)i)
           return true;
       }
     }


Index: llvm/lib/CodeGen/VirtRegMap.cpp
diff -u llvm/lib/CodeGen/VirtRegMap.cpp:1.83 llvm/lib/CodeGen/VirtRegMap.cpp:1.84
--- llvm/lib/CodeGen/VirtRegMap.cpp:1.83	Wed Dec  6 18:46:04 2006
+++ llvm/lib/CodeGen/VirtRegMap.cpp	Wed Dec  6 19:19:37 2006
@@ -97,7 +97,8 @@
   }
 
   ModRef MRInfo;
-  if (TII.getOperandConstraint(OldMI->getOpcode(), OpNo, TOI::TIED_TO) != -1) {
+  if (OldMI->getInstrDescriptor()->
+      getOperandConstraint(OpNo, TOI::TIED_TO) != -1) {
     // Folded a two-address operand.
     MRInfo = isModRef;
   } else if (OldMI->getOperand(OpNo).isDef()) {
@@ -591,7 +592,7 @@
         // aren't allowed to modify the reused register.  If none of these cases
         // apply, reuse it.
         bool CanReuse = true;
-        int ti = TII->getOperandConstraint(MI.getOpcode(), i, TOI::TIED_TO);
+        int ti = MI.getInstrDescriptor()->getOperandConstraint(i, TOI::TIED_TO);
         if (ti != -1 &&
             MI.getOperand(ti).isReg() && 
             MI.getOperand(ti).getReg() == VirtReg) {