diff options
| -rw-r--r-- | polly/lib/CodeGen/BlockGenerators.cpp | 2 | ||||
| -rw-r--r-- | polly/test/Isl/CodeGen/non-affine-phi-node-expansion-3.ll | 2 | ||||
| -rw-r--r-- | polly/test/Isl/CodeGen/non-affine-phi-node-expansion-4.ll | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp index 6453271a4f8..962cc380244 100644 --- a/polly/lib/CodeGen/BlockGenerators.cpp +++ b/polly/lib/CodeGen/BlockGenerators.cpp @@ -1141,7 +1141,7 @@ void RegionGenerator::copyStmt(ScopStmt &Stmt, LoopToScevMapT <S, // replacement for SCEVs refering to the old loop. for (BasicBlock *BB : SeenBlocks) { Loop *L = LI.getLoopFor(BB); - if (L == nullptr || L->getHeader() != BB) + if (L == nullptr || L->getHeader() != BB || !R->contains(L)) continue; BasicBlock *BBCopy = BlockMap[BB]; diff --git a/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-3.ll b/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-3.ll index 8cbbc227636..2f264487038 100644 --- a/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-3.ll +++ b/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-3.ll @@ -13,11 +13,9 @@ loop: br i1 %cond0, label %branch1, label %backedge ; CHECK-LABEL: polly.stmt.loop: -; CHECK-NEXT: %polly.subregion.iv = phi i32 [ 0, %polly.stmt.loop.entry ] ; CHECK-NEXT: %p_val0 = fadd float 1.000000e+00, 2.000000e+00 ; CHECK-NEXT: %p_val1 = fadd float 1.000000e+00, 2.000000e+00 ; CHECK-NEXT: %p_val2 = fadd float 1.000000e+00, 2.000000e+00 -; CHECK-NEXT: %polly.subregion.iv.inc = add i32 %polly.subregion.iv, 1 ; CHECK-NEXT: store float %p_val0, float* %merge.phiops ; CHECK-NEXT: br i1 diff --git a/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-4.ll b/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-4.ll index 2ad52d180e4..158bfe2304a 100644 --- a/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-4.ll +++ b/polly/test/Isl/CodeGen/non-affine-phi-node-expansion-4.ll @@ -12,10 +12,8 @@ loop: br i1 %cond0, label %branch1, label %backedge ; CHECK-LABEL: polly.stmt.loop: -; CHECK-NEXT: %polly.subregion.iv = phi i32 [ 0, %polly.stmt.loop.entry ] ; CHECK-NEXT: %p_val0 = fadd float 1.000000e+00, 2.000000e+00 ; CHECK-NEXT: %p_val1 = fadd float 1.000000e+00, 2.000000e+00 -; CHECK-NEXT: %polly.subregion.iv.inc = add i32 %polly.subregion.iv, 1 ; CHECK-NEXT: store float %p_val0, float* %merge.phiops ; CHECK-NEXT: br i1 |
