More templatization.

[oota-llvm.git] / lib / CodeGen / StrongPHIElimination.cpp

diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index 3d5ee9fb3ceb60a8c74895206f0016c86886b78d..d023b59277a7843100b334fc688a0dc2a5a06f70 100644 (file)
--- a/lib/CodeGen/StrongPHIElimination.cpp
+++ b/lib/CodeGen/StrongPHIElimination.cpp
@@ -26,6 +26,7 @@
 #include "llvm/CodeGen/MachineDominators.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/ADT/Statistic.h"
@@ -284,24 +285,28 @@ void StrongPHIElimination::processBlock(MachineBasicBlock* MBB) {
       } else {
         PHIUnion.insert(SrcReg);
         UnionedBlocks.insert(SrcInfo.DefInst->getParent());
-        
-        // DO STUFF HERE
-        
       }
-      
-      ProcessedNames.insert(PHIUnion.begin(), PHIUnion.end());
     }
     
+    std::vector<StrongPHIElimination::DomForestNode*> DF = 
+                                                     computeDomForest(PHIUnion);
+    
+    // DO STUFF HERE
+    
+    ProcessedNames.insert(PHIUnion.begin(), PHIUnion.end());
     ++P;
   }
 }
 
+/// breakCriticalEdges - Break critical edges coming into blocks with PHI
+/// nodes, preserving dominator and livevariable info.
 void StrongPHIElimination::breakCriticalEdges(MachineFunction &Fn) {
   typedef std::pair<MachineBasicBlock*, MachineBasicBlock*> MBB_pair;
   
   MachineDominatorTree& MDT = getAnalysis<MachineDominatorTree>();
-  //LiveVariables& LV = getAnalysis<LiveVariables>();
+  LiveVariables& LV = getAnalysis<LiveVariables>();
   
+  // Find critical edges
   std::vector<MBB_pair> criticals;
   for (MachineFunction::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
     if (!I->empty() &&
@@ -314,9 +319,16 @@ void StrongPHIElimination::breakCriticalEdges(MachineFunction &Fn) {
   
   for (std::vector<MBB_pair>::iterator I = criticals.begin(),
        E = criticals.end(); I != E; ++I) {
-    SplitCriticalMachineEdge(I->first, I->second);
+    // Split the edge
+    MachineBasicBlock* new_bb = SplitCriticalMachineEdge(I->first, I->second);
     
+    // Update dominators
     MDT.splitBlock(I->first);
+    
+    // Update livevariables
+    for (unsigned var = 1024; var < Fn.getSSARegMap()->getLastVirtReg(); ++var)
+      if (isLiveOut(LV.getVarInfo(var), I->first))
+        LV.getVarInfo(var).AliveBlocks.set(new_bb->getNumber());
   }
 }