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

and the PostDomTree version first.

llvm-svn: 42250

2 files changed, 3 insertions, 2 deletions

diff --git a/llvm/include/llvm/Analysis/Dominators.h b/llvm/include/llvm/Analysis/Dominators.h
index eec87d43474..f4c31a5f161 100644
--- a/llvm/include/llvm/Analysis/Dominators.h
+++ b/llvm/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/llvm/lib/VMCore/Dominators.cpp b/llvm/lib/VMCore/Dominators.cpp
index 860387fffda..0fc024ba6fe 100644
--- a/llvm/lib/VMCore/Dominators.cpp
+++ b/llvm/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.