commit 6adcf56b0f738f66f32b2cc70e9117049672db89
author Chandler Carruth <chandlerc@gmail.com> Sun Jan 18 01:47:30 2015 +0000
committer Chandler Carruth <chandlerc@gmail.com> Sun Jan 18 01:47:30 2015 +0000
tree af096bf21f74e4107a766bc5f9d549b245b504e7
parent 5eee895ccf9bea773e3c01f8915a9fba106e4f3f

[PM] Update Polly for LLVM r226385 which made LoopInfo actually derive
from LoopInfoBase<...>, removing the need for the awkward getBase()
dance.

llvm-svn: 226387

polly/lib/CodeGen/IslCodeGeneration.cpp

diff --git a/polly/lib/CodeGen/IslCodeGeneration.cpp b/polly/lib/CodeGen/IslCodeGeneration.cpp
index 401c005..b80a250 100644
--- a/polly/lib/CodeGen/IslCodeGeneration.cpp
+++ b/polly/lib/CodeGen/IslCodeGeneration.cpp
@@ -711,8 +711,8 @@
 
   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();

polly/lib/CodeGen/LoopGenerators.cpp

diff --git a/polly/lib/CodeGen/LoopGenerators.cpp b/polly/lib/CodeGen/LoopGenerators.cpp
index af04137..05ab620 100644
--- a/polly/lib/CodeGen/LoopGenerators.cpp
+++ b/polly/lib/CodeGen/LoopGenerators.cpp
@@ -80,11 +80,11 @@
 
   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.

polly/lib/CodeGen/Utils.cpp

diff --git a/polly/lib/CodeGen/Utils.cpp b/polly/lib/CodeGen/Utils.cpp
index c9b1d71..87e3703 100644
--- a/polly/lib/CodeGen/Utils.cpp
+++ b/polly/lib/CodeGen/Utils.cpp
@@ -60,7 +60,7 @@
   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);