4 files changed, 20 insertions, 25 deletions

diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index 0740f729f2..0ee71b18ee 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -127,7 +127,7 @@ protected:
   std::vector<BasicBlock*> Vertex;
 
   // Info - Collection of information used during the computation of idoms.
-  std::map<BasicBlock*, InfoRec> Info;
+  DenseMap<BasicBlock*, InfoRec> Info;
 
   void updateDFSNumbers();
 
@@ -298,7 +298,7 @@ public:
 private:
   void calculate(Function& F);
   DomTreeNode *getNodeForBlock(BasicBlock *BB);
-  unsigned DFSPass(BasicBlock *V, InfoRec &VInfo, unsigned N);
+  unsigned DFSPass(BasicBlock *V, unsigned N);
   void Compress(BasicBlock *V);
   BasicBlock *Eval(BasicBlock *v);
   void Link(BasicBlock *V, BasicBlock *W, InfoRec &WInfo);
diff --git a/include/llvm/Analysis/PostDominators.h b/include/llvm/Analysis/PostDominators.h
index 5841da3fcf..8dfeafe55a 100644
--- a/include/llvm/Analysis/PostDominators.h
+++ b/include/llvm/Analysis/PostDominators.h
@@ -39,7 +39,7 @@ struct PostDominatorTree : public DominatorTreeBase {
 private:
   void calculate(Function &F);
   DomTreeNode *getNodeForBlock(BasicBlock *BB);
-  unsigned DFSPass(BasicBlock *V, InfoRec &VInfo,unsigned N);
+  unsigned DFSPass(BasicBlock *V, unsigned N);
   void Compress(BasicBlock *V, InfoRec &VInfo);
   BasicBlock *Eval(BasicBlock *V);
   void Link(BasicBlock *V, BasicBlock *W, InfoRec &WInfo);
diff --git a/lib/Analysis/PostDominators.cpp b/lib/Analysis/PostDominators.cpp
index e3169a5c83..244f8cdff5 100644
--- a/lib/Analysis/PostDominators.cpp
+++ b/lib/Analysis/PostDominators.cpp
@@ -27,28 +27,25 @@ char PostDominanceFrontier::ID = 0;
 static RegisterPass<PostDominatorTree>
 F("postdomtree", "Post-Dominator Tree Construction", true);
 
-unsigned PostDominatorTree::DFSPass(BasicBlock *V, InfoRec &VInfo,
-                                    unsigned N) {
-  std::vector<std::pair<BasicBlock *, InfoRec *> > workStack;
+unsigned PostDominatorTree::DFSPass(BasicBlock *V, unsigned N) {
+  std::vector<BasicBlock *> workStack;
   std::set<BasicBlock *> visited;
-  workStack.push_back(std::make_pair(V, &VInfo));
+  workStack.push_back(V);
 
   do {
-    BasicBlock *currentBB = workStack.back().first; 
-    InfoRec *currentVInfo = workStack.back().second;
+    BasicBlock *currentBB = workStack.back();
+    InfoRec &CurVInfo = Info[currentBB];
 
     // Visit each block only once.
-    if (visited.count(currentBB) == 0) {
-
-      visited.insert(currentBB);
-      currentVInfo->Semi = ++N;
-      currentVInfo->Label = currentBB;
+    if (visited.insert(currentBB).second) {
+      CurVInfo.Semi = ++N;
+      CurVInfo.Label = currentBB;
       
       Vertex.push_back(currentBB);  // Vertex[n] = current;
       // Info[currentBB].Ancestor = 0;     
       // Ancestor[n] = 0
       // Child[currentBB] = 0;
-      currentVInfo->Size = 1;       // Size[currentBB] = 1
+      CurVInfo.Size = 1;       // Size[currentBB] = 1
     }
 
     // Visit children
@@ -58,8 +55,8 @@ unsigned PostDominatorTree::DFSPass(BasicBlock *V, InfoRec &VInfo,
       InfoRec &SuccVInfo = Info[*PI];
       if (SuccVInfo.Semi == 0) {
         SuccVInfo.Parent = currentBB;
-        if (visited.count (*PI) == 0) {
-          workStack.push_back(std::make_pair(*PI, &SuccVInfo));   
+        if (!visited.count(*PI)) {
+          workStack.push_back(*PI);   
           visitChild = true;
         }
       }
@@ -130,7 +127,7 @@ void PostDominatorTree::calculate(Function &F) {
   // in later stages of the algorithm.
   unsigned N = 0;
   for (unsigned i = 0, e = Roots.size(); i != e; ++i)
-    N = DFSPass(Roots[i], Info[Roots[i]], N);
+    N = DFSPass(Roots[i], N);
   
   for (unsigned i = N; i >= 2; --i) {
     BasicBlock *W = Vertex[i];
diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp
index 9b36e1de63..bb780c505d 100644
--- a/lib/VMCore/Dominators.cpp
+++ b/lib/VMCore/Dominators.cpp
@@ -146,12 +146,12 @@ void DominatorTree::splitBlock(BasicBlock *NewBB) {
   }
 }
 
-unsigned DominatorTree::DFSPass(BasicBlock *V, InfoRec &VInfo,
-                                      unsigned N) {
+unsigned DominatorTree::DFSPass(BasicBlock *V, unsigned N) {
   // This is more understandable as a recursive algorithm, but we can't use the
   // recursive algorithm due to stack depth issues.  Keep it here for
   // documentation purposes.
 #if 0
+  InfoRec &VInfo = Info[Roots[i]];
   VInfo.Semi = ++N;
   VInfo.Label = V;
 
@@ -164,7 +164,7 @@ unsigned DominatorTree::DFSPass(BasicBlock *V, InfoRec &VInfo,
     InfoRec &SuccVInfo = Info[*SI];
     if (SuccVInfo.Semi == 0) {
       SuccVInfo.Parent = V;
-      N = DFSPass(*SI, SuccVInfo, N);
+      N = DFSPass(*SI, N);
     }
   }
 #else
@@ -313,7 +313,7 @@ void DominatorTree::Link(BasicBlock *V, BasicBlock *W, InfoRec &WInfo){
 #endif
 }
 
-void DominatorTree::calculate(Function& F) {
+void DominatorTree::calculate(Function &F) {
   BasicBlock* Root = Roots[0];
 
   // Add a node for the root...
@@ -323,9 +323,7 @@ void DominatorTree::calculate(Function& F) {
 
   // Step #1: Number blocks in depth-first order and initialize variables used
   // in later stages of the algorithm.
-  unsigned N = 0;
-  for (unsigned i = 0, e = Roots.size(); i != e; ++i)
-    N = DFSPass(Roots[i], Info[Roots[i]], 0);
+  unsigned N = DFSPass(Root, 0);
 
   for (unsigned i = N; i >= 2; --i) {
     BasicBlock *W = Vertex[i];