commit b4f08eb671643f96d837cebd3d9183a38f806308
author Johannes Doerfert <doerfert@cs.uni-saarland.de> Mon Feb 23 13:51:35 2015 +0000
committer Johannes Doerfert <doerfert@cs.uni-saarland.de> Mon Feb 23 13:51:35 2015 +0000
tree 0751b7edd8434bf8af4ededdabfde557d13952c1
parent 8198cfd8a7ddd41c413f9ce186e02f0e17167979

[REFACTOR] Replace Pass* from BlockGen by the DomTree

llvm-svn: 230220

polly/lib/CodeGen/BlockGenerators.cpp

diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp
index a002569..8b6abf1 100644
--- a/polly/lib/CodeGen/BlockGenerators.cpp
+++ b/polly/lib/CodeGen/BlockGenerators.cpp
@@ -76,9 +76,10 @@
   return false;
 }
 
-BlockGenerator::BlockGenerator(PollyIRBuilder &B, Pass *P, LoopInfo &LI,
-                               ScalarEvolution &SE, IslExprBuilder *ExprBuilder)
-    : Builder(B), P(P), LI(LI), SE(SE), ExprBuilder(ExprBuilder) {}
+BlockGenerator::BlockGenerator(PollyIRBuilder &B, LoopInfo &LI,
+                               ScalarEvolution &SE, DominatorTree &DT,
+                               IslExprBuilder *ExprBuilder)
+    : Builder(B), LI(LI), SE(SE), ExprBuilder(ExprBuilder), DT(DT) {}
 
 Value *BlockGenerator::getNewValue(ScopStmt &Stmt, const Value *Old,
                                    ValueMapT &BBMap, ValueMapT &GlobalMap,
@@ -285,12 +286,9 @@
 
 void BlockGenerator::copyBB(ScopStmt &Stmt, ValueMapT &GlobalMap,
                             LoopToScevMapT &LTS) {
-  auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
-  auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
-
   BasicBlock *BB = Stmt.getBasicBlock();
   BasicBlock *CopyBB =
-      SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), DT, &LI);
+      SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), &DT, &LI);
   CopyBB->setName("polly.stmt." + BB->getName());
   Builder.SetInsertPoint(CopyBB->begin());
 
@@ -623,12 +621,9 @@
 }
 
 void VectorBlockGenerator::copyBB(ScopStmt &Stmt) {
-  auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
-  auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
-
   BasicBlock *BB = Stmt.getBasicBlock();
   BasicBlock *CopyBB =
-      SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), DT, &LI);
+      SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), &DT, &LI);
   CopyBB->setName("polly.stmt." + BB->getName());
   Builder.SetInsertPoint(CopyBB->begin());