Merge significant portions of the DomTree and PostDomTree implementations.

The two remaining unmerged parts are DFSPass, and the Calculate().


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

2 files changed, 5 insertions, 7 deletions

diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index f4c31a5..b9c85b5 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -275,6 +275,11 @@ public:
   virtual void dump();
   
 protected:
+  friend void Compress(DominatorTreeBase& DT, BasicBlock *VIn);
+  friend BasicBlock *Eval(DominatorTreeBase& DT, BasicBlock *V);
+  friend void Link(DominatorTreeBase& DT, BasicBlock *V,
+                   BasicBlock *W, InfoRec &WInfo);
+  
   /// updateDFSNumbers - Assign In and Out numbers to the nodes while walking
   /// dominator tree in dfs order.
   void updateDFSNumbers();
@@ -314,10 +319,6 @@ public:
 
 private:
   friend void DTcalculate(DominatorTree& DT, Function& F);
-  friend void DTCompress(DominatorTree& DT, BasicBlock *VIn);
-  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/include/llvm/Analysis/PostDominators.h b/include/llvm/Analysis/PostDominators.h
index 06a42da..b2a37ff 100644
--- a/include/llvm/Analysis/PostDominators.h
+++ b/include/llvm/Analysis/PostDominators.h
@@ -39,9 +39,6 @@ struct PostDominatorTree : public DominatorTreeBase {
 private:
   unsigned DFSPass(BasicBlock *V, unsigned N);
   friend void PDTcalculate(PostDominatorTree& PDT, Function &F);
-  friend void PDTCompress(PostDominatorTree& PDT, BasicBlock *V,
-                          InfoRec &VInfo);
-  friend BasicBlock *PDTEval(PostDominatorTree& PDT, BasicBlock *V);
   friend void PDTLink(PostDominatorTree& PDT,BasicBlock *V,
                       BasicBlock *W, InfoRec &WInfo);
 };