[PM] Update Polly for LLVM r226459 which removed another pass argument

from an API in the process of preparing for the new pass manager.

llvm-svn: 226460

1 files changed, 6 insertions, 6 deletions

diff --git a/polly/lib/Support/ScopHelper.cpp b/polly/lib/Support/ScopHelper.cpp
index bf6ad07e26b..52e673357ae 100644
--- a/polly/lib/Support/ScopHelper.cpp
+++ b/polly/lib/Support/ScopHelper.cpp
@@ -115,13 +115,13 @@ BasicBlock *polly::simplifyRegion(Scop *S, Pass *P) {
   BasicBlock *OldEntry = R->getEntry();
   BasicBlock *NewEntry = nullptr;
 
+  auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
+  auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
+  auto *LIWP = P->getAnalysisIfAvailable<LoopInfoWrapperPass>();
+  auto *LI = LIWP ? &LIWP->getLoopInfo() : nullptr;
+
   // Create single entry edge if the region has multiple entry edges.
   if (!EnteringBB) {
-    auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
-    auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
-    auto *LIWP = P->getAnalysisIfAvailable<LoopInfoWrapperPass>();
-    auto *LI = LIWP ? &LIWP->getLoopInfo() : nullptr;
-
     NewEntry = SplitBlock(OldEntry, OldEntry->begin(), DT, LI);
     EnteringBB = OldEntry;
   }
@@ -129,7 +129,7 @@ BasicBlock *polly::simplifyRegion(Scop *S, Pass *P) {
   // Create an unconditional entry edge.
   if (EnteringBB->getTerminator()->getNumSuccessors() != 1) {
     BasicBlock *EntryBB = NewEntry ? NewEntry : OldEntry;
-    BasicBlock *SplitEdgeBB = SplitEdge(EnteringBB, EntryBB, P);
+    BasicBlock *SplitEdgeBB = SplitEdge(EnteringBB, EntryBB, DT, LI);
 
     // Once the edge between EnteringBB and EntryBB is split, two cases arise.
     // The first is simple. The new block is inserted between EnteringBB and