[polly] r226387 - [PM] Update Polly for LLVM r226385 which made LoopInfo actually derive

[Chandler Carruth]

Author: chandlerc
Date: Sat Jan 17 19:47:30 2015
New Revision: 226387

URL: http://llvm.org/viewvc/llvm-project?rev=226387&view=rev
Log:
[PM] Update Polly for LLVM r226385 which made LoopInfo actually derive
from LoopInfoBase<...>, removing the need for the awkward getBase()
dance.

Modified:
    polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
    polly/trunk/lib/CodeGen/LoopGenerators.cpp
    polly/trunk/lib/CodeGen/Utils.cpp

Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=226387&r1=226386&r2=226387&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Sat Jan 17 19:47:30 2015
@@ -711,8 +711,8 @@ void IslNodeBuilder::createIf(__isl_take
 
   Loop *L = LI.getLoopFor(CondBB);
   if (L) {
-    L->addBasicBlockToLoop(ThenBB, LI.getBase());
-    L->addBasicBlockToLoop(ElseBB, LI.getBase());
+    L->addBasicBlockToLoop(ThenBB, LI);
+    L->addBasicBlockToLoop(ElseBB, LI);
   }
 
   CondBB->getTerminator()->eraseFromParent();

Modified: polly/trunk/lib/CodeGen/LoopGenerators.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=226387&r1=226386&r2=226387&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/LoopGenerators.cpp (original)
+++ polly/trunk/lib/CodeGen/LoopGenerators.cpp Sat Jan 17 19:47:30 2015
@@ -80,11 +80,11 @@ Value *polly::createLoop(Value *LB, Valu
 
   if (OuterLoop) {
     if (GuardBB)
-      OuterLoop->addBasicBlockToLoop(GuardBB, LI.getBase());
-    OuterLoop->addBasicBlockToLoop(PreHeaderBB, LI.getBase());
+      OuterLoop->addBasicBlockToLoop(GuardBB, LI);
+    OuterLoop->addBasicBlockToLoop(PreHeaderBB, LI);
   }
 
-  NewLoop->addBasicBlockToLoop(HeaderBB, LI.getBase());
+  NewLoop->addBasicBlockToLoop(HeaderBB, LI);
 
   // Notify the annotator (if present) that we have a new loop, but only
   // after the header block is set.

Modified: polly/trunk/lib/CodeGen/Utils.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/Utils.cpp?rev=226387&r1=226386&r2=226387&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/Utils.cpp (original)
+++ polly/trunk/lib/CodeGen/Utils.cpp Sat Jan 17 19:47:30 2015
@@ -60,7 +60,7 @@ BasicBlock *polly::executeScopConditiona
   Builder.SetInsertPoint(SplitBlock);
   Builder.CreateCondBr(RTC, StartBlock, R.getEntry());
   if (Loop *L = LI.getLoopFor(SplitBlock))
-    L->addBasicBlockToLoop(StartBlock, LI.getBase());
+    L->addBasicBlockToLoop(StartBlock, LI);
   DT.addNewBlock(StartBlock, SplitBlock);
   Builder.SetInsertPoint(StartBlock);