[llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.cpp LiveVariables.cpp PHIElimination.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

LiveIntervals.cpp updated: 1.81 -> 1.82
LiveVariables.cpp updated: 1.34 -> 1.35
PHIElimination.cpp updated: 1.27 -> 1.28

---
Log message:

Start using MBB numbers directly instead of going through the live variables
map.


---
Diffs of the changes:  (+4 -4)

Index: llvm/lib/CodeGen/LiveIntervals.cpp
diff -u llvm/lib/CodeGen/LiveIntervals.cpp:1.81 llvm/lib/CodeGen/LiveIntervals.cpp:1.82
--- llvm/lib/CodeGen/LiveIntervals.cpp:1.81	Tue Jun 29 02:16:23 2004
+++ llvm/lib/CodeGen/LiveIntervals.cpp	Wed Jun 30 23:29:47 2004
@@ -96,7 +96,7 @@
     unsigned miIndex = 0;
     for (MachineFunction::iterator mbb = mf_->begin(), mbbEnd = mf_->end();
          mbb != mbbEnd; ++mbb) {
-        unsigned mbbIdx = lv_->getMachineBasicBlockIndex(mbb);
+        unsigned mbbIdx = mbb->getNumber();
         bool inserted = mbbi2mbbMap_.insert(std::make_pair(mbbIdx,
                                                            mbb)).second;
         assert(inserted && "multiple index -> MachineBasicBlock");


Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.34 llvm/lib/CodeGen/LiveVariables.cpp:1.35
--- llvm/lib/CodeGen/LiveVariables.cpp:1.34	Wed Jun 30 23:24:29 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Wed Jun 30 23:29:47 2004
@@ -70,7 +70,7 @@
 
 void LiveVariables::MarkVirtRegAliveInBlock(VarInfo &VRInfo,
                                             MachineBasicBlock *MBB) {
-  unsigned BBNum = getMachineBasicBlockIndex(MBB);
+  unsigned BBNum = MBB->getNumber();
 
   // Check to see if this basic block is one of the killing blocks.  If so,
   // remove it...
@@ -204,7 +204,7 @@
   for (df_ext_iterator<MachineBasicBlock*> DFI = df_ext_begin(Entry, Visited),
          E = df_ext_end(Entry, Visited); DFI != E; ++DFI) {
     MachineBasicBlock *MBB = *DFI;
-    unsigned BBNum = getMachineBasicBlockIndex(MBB);
+    unsigned BBNum = MBB->getNumber();
 
     // Loop over all of the instructions, processing them.
     for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end();


Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.27 llvm/lib/CodeGen/PHIElimination.cpp:1.28
--- llvm/lib/CodeGen/PHIElimination.cpp:1.27	Wed Jun  2 00:57:12 2004
+++ llvm/lib/CodeGen/PHIElimination.cpp	Wed Jun 30 23:29:47 2004
@@ -226,7 +226,7 @@
             MachineBasicBlock *SuccMBB = *SI;
             
             // Is it alive in this successor?
-            unsigned SuccIdx = LV->getMachineBasicBlockIndex(SuccMBB);
+            unsigned SuccIdx = SuccMBB->getNumber();
             if (SuccIdx < InRegVI.AliveBlocks.size() &&
                 InRegVI.AliveBlocks[SuccIdx]) {
               ValueIsLive = true;