<div dir="ltr">Ooof, sorry i didn't update here.<div><br></div><div>I should work on getting Polly to at least build so that I catch and update it when refactoring things.</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Mon, Jan 13, 2014 at 2:29 PM, Tobias Grosser <span dir="ltr"><<a href="mailto:tobias@grosser.es" target="_blank">tobias@grosser.es</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: grosser<br>
Date: Mon Jan 13 16:29:56 2014<br>
New Revision: 199157<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=199157&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=199157&view=rev</a><br>
Log:<br>
Adapt to DomTree changes in r199104<br>
<br>
Modified:<br>
    polly/trunk/lib/Analysis/ScopDetection.cpp<br>
    polly/trunk/lib/Analysis/TempScopInfo.cpp<br>
    polly/trunk/lib/CodeGen/CodeGeneration.cpp<br>
    polly/trunk/lib/CodeGen/IslCodeGeneration.cpp<br>
    polly/trunk/lib/CodeGen/LoopGenerators.cpp<br>
    polly/trunk/lib/CodeGen/Utils.cpp<br>
    polly/trunk/lib/CodePreparation.cpp<br>
    polly/trunk/lib/IndVarSimplify.cpp<br>
    polly/trunk/lib/IndependentBlocks.cpp<br>
<br>
Modified: polly/trunk/lib/Analysis/ScopDetection.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)<br>
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Mon Jan 13 16:29:56 2014<br>
@@ -751,7 +751,7 @@ void polly::ScopDetection::verifyAnalysi<br>
 }<br>
<br>
 void ScopDetection::getAnalysisUsage(AnalysisUsage &AU) const {<br>
-  AU.addRequired<DominatorTree>();<br>
+  AU.addRequired<DominatorTreeWrapperPass>();<br>
   AU.addRequired<PostDominatorTree>();<br>
   AU.addRequired<LoopInfo>();<br>
   AU.addRequired<ScalarEvolution>();<br>
@@ -784,7 +784,7 @@ INITIALIZE_PASS_BEGIN(ScopDetection, "po<br>
                       "Polly - Detect static control parts (SCoPs)", false,<br>
                       false);<br>
 INITIALIZE_AG_DEPENDENCY(AliasAnalysis);<br>
-INITIALIZE_PASS_DEPENDENCY(DominatorTree);<br>
+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);<br>
 INITIALIZE_PASS_DEPENDENCY(LoopInfo);<br>
 INITIALIZE_PASS_DEPENDENCY(PostDominatorTree);<br>
 INITIALIZE_PASS_DEPENDENCY(RegionInfo);<br>
<br>
Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)<br>
+++ polly/trunk/lib/Analysis/TempScopInfo.cpp Mon Jan 13 16:29:56 2014<br>
@@ -336,7 +336,7 @@ void TempScopInfo::print(raw_ostream &OS<br>
 }<br>
<br>
 bool TempScopInfo::runOnFunction(Function &F) {<br>
-  DT = &getAnalysis<DominatorTree>();<br>
+  DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
   PDT = &getAnalysis<PostDominatorTree>();<br>
   SE = &getAnalysis<ScalarEvolution>();<br>
   LI = &getAnalysis<LoopInfo>();<br>
@@ -355,7 +355,7 @@ bool TempScopInfo::runOnFunction(Functio<br>
<br>
 void TempScopInfo::getAnalysisUsage(AnalysisUsage &AU) const {<br>
   AU.addRequired<DataLayout>();<br>
-  AU.addRequiredTransitive<DominatorTree>();<br>
+  AU.addRequiredTransitive<DominatorTreeWrapperPass>();<br>
   AU.addRequiredTransitive<PostDominatorTree>();<br>
   AU.addRequiredTransitive<LoopInfo>();<br>
   AU.addRequiredTransitive<ScalarEvolution>();<br>
@@ -385,7 +385,7 @@ INITIALIZE_PASS_BEGIN(TempScopInfo, "pol<br>
                       "Polly - Analyse the LLVM-IR in the detected regions",<br>
                       false, false);<br>
 INITIALIZE_AG_DEPENDENCY(AliasAnalysis);<br>
-INITIALIZE_PASS_DEPENDENCY(DominatorTree);<br>
+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);<br>
 INITIALIZE_PASS_DEPENDENCY(LoopInfo);<br>
 INITIALIZE_PASS_DEPENDENCY(PostDominatorTree);<br>
 INITIALIZE_PASS_DEPENDENCY(RegionInfo);<br>
<br>
Modified: polly/trunk/lib/CodeGen/CodeGeneration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/CodeGeneration.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/CodeGeneration.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/CodeGen/CodeGeneration.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/CodeGeneration.cpp Mon Jan 13 16:29:56 2014<br>
@@ -619,7 +619,7 @@ void ClastStmtCodeGen::codegenForOpenMP(<br>
   ClastVars = ClastVarsCopy;<br>
<br>
   clearDomtree((*LoopBody).getParent()->getParent(),<br>
-               P->getAnalysis<DominatorTree>());<br>
+               P->getAnalysis<DominatorTreeWrapperPass>().getDomTree());<br>
<br>
   Builder.SetInsertPoint(AfterLoop);<br>
 }<br>
@@ -907,7 +907,7 @@ void ClastStmtCodeGen::codegen(const cla<br>
   MergeBB->setName("polly.merge");<br>
   BasicBlock *ThenBB = BasicBlock::Create(Context, "polly.then", F);<br>
<br>
-  DominatorTree &DT = P->getAnalysis<DominatorTree>();<br>
+  DominatorTree &DT = P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
   DT.addNewBlock(ThenBB, CondBB);<br>
   DT.changeImmediateDominator(MergeBB, CondBB);<br>
<br>
@@ -1028,7 +1028,7 @@ public:<br>
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {<br>
     AU.addRequired<CloogInfo>();<br>
     AU.addRequired<Dependences>();<br>
-    AU.addRequired<DominatorTree>();<br>
+    AU.addRequired<DominatorTreeWrapperPass>();<br>
     AU.addRequired<RegionInfo>();<br>
     AU.addRequired<ScalarEvolution>();<br>
     AU.addRequired<ScopDetection>();<br>
@@ -1039,7 +1039,7 @@ public:<br>
     AU.addPreserved<CloogInfo>();<br>
     AU.addPreserved<Dependences>();<br>
     AU.addPreserved<LoopInfo>();<br>
-    AU.addPreserved<DominatorTree>();<br>
+    AU.addPreserved<DominatorTreeWrapperPass>();<br>
     AU.addPreserved<ScopDetection>();<br>
     AU.addPreserved<ScalarEvolution>();<br>
<br>
@@ -1061,7 +1061,7 @@ INITIALIZE_PASS_BEGIN(CodeGeneration, "p<br>
                       "Polly - Create LLVM-IR from SCoPs", false, false);<br>
 INITIALIZE_PASS_DEPENDENCY(CloogInfo);<br>
 INITIALIZE_PASS_DEPENDENCY(Dependences);<br>
-INITIALIZE_PASS_DEPENDENCY(DominatorTree);<br>
+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);<br>
 INITIALIZE_PASS_DEPENDENCY(RegionInfo);<br>
 INITIALIZE_PASS_DEPENDENCY(ScalarEvolution);<br>
 INITIALIZE_PASS_DEPENDENCY(ScopDetection);<br>
<br>
Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Mon Jan 13 16:29:56 2014<br>
@@ -848,7 +848,7 @@ void IslNodeBuilder::createIf(__isl_take<br>
   BasicBlock *ThenBB = BasicBlock::Create(Context, "polly.then", F);<br>
   BasicBlock *ElseBB = BasicBlock::Create(Context, "polly.else", F);<br>
<br>
-  DominatorTree &DT = P->getAnalysis<DominatorTree>();<br>
+  DominatorTree &DT = P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
   DT.addNewBlock(ThenBB, CondBB);<br>
   DT.addNewBlock(ElseBB, CondBB);<br>
   DT.changeImmediateDominator(MergeBB, CondBB);<br>
@@ -1052,7 +1052,7 @@ public:<br>
   virtual void printScop(raw_ostream &OS) const {}<br>
<br>
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {<br>
-    AU.addRequired<DominatorTree>();<br>
+    AU.addRequired<DominatorTreeWrapperPass>();<br>
     AU.addRequired<IslAstInfo>();<br>
     AU.addRequired<RegionInfo>();<br>
     AU.addRequired<ScalarEvolution>();<br>
@@ -1063,7 +1063,7 @@ public:<br>
     AU.addPreserved<Dependences>();<br>
<br>
     AU.addPreserved<LoopInfo>();<br>
-    AU.addPreserved<DominatorTree>();<br>
+    AU.addPreserved<DominatorTreeWrapperPass>();<br>
     AU.addPreserved<IslAstInfo>();<br>
     AU.addPreserved<ScopDetection>();<br>
     AU.addPreserved<ScalarEvolution>();<br>
@@ -1085,7 +1085,7 @@ Pass *polly::createIslCodeGenerationPass<br>
 INITIALIZE_PASS_BEGIN(IslCodeGeneration, "polly-codegen-isl",<br>
                       "Polly - Create LLVM-IR from SCoPs", false, false);<br>
 INITIALIZE_PASS_DEPENDENCY(Dependences);<br>
-INITIALIZE_PASS_DEPENDENCY(DominatorTree);<br>
+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);<br>
 INITIALIZE_PASS_DEPENDENCY(LoopInfo);<br>
 INITIALIZE_PASS_DEPENDENCY(RegionInfo);<br>
 INITIALIZE_PASS_DEPENDENCY(ScalarEvolution);<br>
<br>
Modified: polly/trunk/lib/CodeGen/LoopGenerators.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/CodeGen/LoopGenerators.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/LoopGenerators.cpp Mon Jan 13 16:29:56 2014<br>
@@ -50,7 +50,7 @@ Value *polly::createLoop(Value *LB, Valu<br>
                          IRBuilder<> &Builder, Pass *P, BasicBlock *&ExitBB,<br>
                          ICmpInst::Predicate Predicate) {<br>
<br>
-  DominatorTree &DT = P->getAnalysis<DominatorTree>();<br>
+  DominatorTree &DT = P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
   LoopInfo &LI = P->getAnalysis<LoopInfo>();<br>
   Function *F = Builder.GetInsertBlock()->getParent();<br>
   LLVMContext &Context = F->getContext();<br>
@@ -279,7 +279,7 @@ Value *OMPGenerator::createSubfunction(V<br>
   CheckNextBB = BasicBlock::Create(Context, "omp.checkNext", FN);<br>
   LoadIVBoundsBB = BasicBlock::Create(Context, "omp.loadIVBounds", FN);<br>
<br>
-  DominatorTree &DT = P->getAnalysis<DominatorTree>();<br>
+  DominatorTree &DT = P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
   DT.addNewBlock(HeaderBB, PrevBB);<br>
   DT.addNewBlock(ExitBB, HeaderBB);<br>
   DT.addNewBlock(CheckNextBB, HeaderBB);<br>
<br>
Modified: polly/trunk/lib/CodeGen/Utils.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/Utils.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/Utils.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/CodeGen/Utils.cpp (original)<br>
+++ polly/trunk/lib/CodeGen/Utils.cpp Mon Jan 13 16:29:56 2014<br>
@@ -23,7 +23,8 @@ BasicBlock *polly::executeScopConditiona<br>
   BasicBlock *StartBlock, *SplitBlock, *NewBlock;<br>
   Region &R = S.getRegion();<br>
   IRBuilder<> Builder(R.getEntry());<br>
-  DominatorTree &DT = PassInfo->getAnalysis<DominatorTree>();<br>
+  DominatorTree &DT =<br>
+      PassInfo->getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
   RegionInfo &RI = PassInfo->getAnalysis<RegionInfo>();<br>
<br>
   // Split the entry edge of the region and generate a new basic block on this<br>
<br>
Modified: polly/trunk/lib/CodePreparation.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodePreparation.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodePreparation.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/CodePreparation.cpp (original)<br>
+++ polly/trunk/lib/CodePreparation.cpp Mon Jan 13 16:29:56 2014<br>
@@ -151,7 +151,7 @@ void CodePreparation::getAnalysisUsage(A<br>
<br>
   AU.addPreserved<LoopInfo>();<br>
   AU.addPreserved<RegionInfo>();<br>
-  AU.addPreserved<DominatorTree>();<br>
+  AU.addPreserved<DominatorTreeWrapperPass>();<br>
   AU.addPreserved<DominanceFrontier>();<br>
 }<br>
<br>
<br>
Modified: polly/trunk/lib/IndVarSimplify.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndVarSimplify.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndVarSimplify.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/IndVarSimplify.cpp (original)<br>
+++ polly/trunk/lib/IndVarSimplify.cpp Mon Jan 13 16:29:56 2014<br>
@@ -84,7 +84,7 @@ public:<br>
   virtual bool runOnLoop(Loop *L, LPPassManager &LPM);<br>
<br>
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {<br>
-    AU.addRequired<DominatorTree>();<br>
+    AU.addRequired<DominatorTreeWrapperPass>();<br>
     AU.addRequired<LoopInfo>();<br>
     AU.addRequired<ScalarEvolution>();<br>
     AU.addRequiredID(LoopSimplifyID);<br>
@@ -1808,7 +1808,7 @@ bool PollyIndVarSimplify::runOnLoop(Loop<br>
     IU = &getAnalysis<IVUsers>();<br>
   LI = &getAnalysis<LoopInfo>();<br>
   SE = &getAnalysis<ScalarEvolution>();<br>
-  DT = &getAnalysis<DominatorTree>();<br>
+  DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();<br>
   TD = getAnalysisIfAvailable<DataLayout>();<br>
<br>
   DeadInsts.clear();<br>
@@ -2003,7 +2003,7 @@ bool PollyIndVarSimplify::runOnLoop(Loop<br>
 INITIALIZE_PASS_BEGIN(PollyIndVarSimplify, "polly-indvars",<br>
                       "Induction Variable Simplification (Polly version)",<br>
                       false, false);<br>
-INITIALIZE_PASS_DEPENDENCY(DominatorTree);<br>
+INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);<br>
 INITIALIZE_PASS_DEPENDENCY(LoopInfo);<br>
 INITIALIZE_PASS_DEPENDENCY(ScalarEvolution);<br>
 INITIALIZE_PASS_DEPENDENCY(LoopSimplify);<br>
<br>
Modified: polly/trunk/lib/IndependentBlocks.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndependentBlocks.cpp?rev=199157&r1=199156&r2=199157&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndependentBlocks.cpp?rev=199157&r1=199156&r2=199157&view=diff</a><br>

==============================================================================<br>
--- polly/trunk/lib/IndependentBlocks.cpp (original)<br>
+++ polly/trunk/lib/IndependentBlocks.cpp Mon Jan 13 16:29:56 2014<br>
@@ -507,7 +507,7 @@ bool IndependentBlocks::areAllBlocksInde<br>
 void IndependentBlocks::getAnalysisUsage(AnalysisUsage &AU) const {<br>
   // FIXME: If we set preserves cfg, the cfg only passes do not need to<br>
   // be "addPreserved"?<br>
-  AU.addPreserved<DominatorTree>();<br>
+  AU.addPreserved<DominatorTreeWrapperPass>();<br>
   AU.addPreserved<DominanceFrontier>();<br>
   AU.addPreserved<PostDominatorTree>();<br>
   AU.addRequired<RegionInfo>();<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>