Completely merge the implementation details of DomTree and PostDomTree.

Also, add a FIXME for a bug in PostDomTree calculation I noticed while writing this,

llvm-svn: 42593

1 files changed, 5 insertions, 2 deletions

diff --git a/llvm/lib/VMCore/Dominators.cpp b/llvm/lib/VMCore/Dominators.cpp
index 57cf6702868..164fb64d0ec 100644
--- a/llvm/lib/VMCore/Dominators.cpp
+++ b/llvm/lib/VMCore/Dominators.cpp
@@ -21,9 +21,9 @@
 #include "llvm/ADT/SetOperations.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
+#include "llvm/Analysis/DominatorInternals.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/Streams.h"
-#include "DominatorCalculation.h"
 #include <algorithm>
 using namespace llvm;
 
@@ -357,7 +357,10 @@ bool DominatorTree::runOnFunction(Function &F) {
   DomTreeNodes[&F.getEntryBlock()] = 0;
   Vertex.push_back(0);
   
-  DTcalculate(*this, F);
+  Calculate<BasicBlock*>(*this, F);
+  
+  updateDFSNumbers();
+  
   return false;
 }