Move DFSPass back down into DominatorTree. I need to figure out what the difference...

and the PostDomTree version first.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42250 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index eec87d434744d1790773e1fa717cce7bb926f1e4..f4c31a5f161a6ddc317f943f4e03b25f552dd17b 100644 (file)
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -129,7 +129,6 @@ protected:
 
   // Info - Collection of information used during the computation of idoms.
   DenseMap<BasicBlock*, InfoRec> Info;
-  unsigned DFSPass(BasicBlock *V, unsigned N);
 
 public:
   DominatorTreeBase(intptr_t ID, bool isPostDom) 
@@ -319,6 +318,8 @@ private:
   friend BasicBlock *DTEval(DominatorTree& DT, BasicBlock *v);
   friend void DTLink(DominatorTree& DT, BasicBlock *V,
                      BasicBlock *W, InfoRec &WInfo);
+  
+  unsigned DFSPass(BasicBlock *V, unsigned N);
 };
 
 //===-------------------------------------

diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp
index 860387fffdab2d4406d86082e7b0a01906cad477..0fc024ba6fe4550de484e547d1d4a21858ccb476 100644 (file)
--- a/lib/VMCore/Dominators.cpp
+++ b/lib/VMCore/Dominators.cpp
@@ -53,7 +53,7 @@ char DominatorTree::ID = 0;
 static RegisterPass<DominatorTree>
 E("domtree", "Dominator Tree Construction", true);
 
-unsigned DominatorTreeBase::DFSPass(BasicBlock *V, 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.