[llvm] 26ab444 - [ConstraintElim] Make sure add-rec is for the current loop.

[Florian Hahn via llvm-commits]

Author: Florian Hahn
Date: 2023-11-08T14:07:28Z
New Revision: 26ab444e88fc8fdd554e5a9381a68b7b5e63b6fd

URL: https://github.com/llvm/llvm-project/commit/26ab444e88fc8fdd554e5a9381a68b7b5e63b6fd
DIFF: https://github.com/llvm/llvm-project/commit/26ab444e88fc8fdd554e5a9381a68b7b5e63b6fd.diff

LOG: [ConstraintElim] Make sure add-rec is for the current loop.

Update addInfoForInductions to also check if the add-rec is for the
current loop. Otherwise we might add incorrect facts or crash.

Fixes a miscompile & crash introduced by 00396e6a1a0b.

Added: 
    llvm/test/Transforms/ConstraintElimination/monotonic-phis-adjacent-loops.ll

Modified: 
    llvm/lib/Transforms/Scalar/ConstraintElimination.cpp

Removed: 
    llvm/test/Transforms/ConstraintElimination/monotonic-int-phis-adjacent-loops.ll


################################################################################
diff  --git a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp
index 2d829ee017be6e4..368082b0150a827 100644
--- a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp
+++ b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp
@@ -870,7 +870,7 @@ void State::addInfoForInductions(BasicBlock &BB) {
 
   auto *AR = dyn_cast_or_null<SCEVAddRecExpr>(SE.getSCEV(PN));
   BasicBlock *LoopPred = L->getLoopPredecessor();
-  if (!AR || !LoopPred)
+  if (!AR || AR->getLoop() != L || !LoopPred)
     return;
 
   const SCEV *StartSCEV = AR->getStart();

diff  --git a/llvm/test/Transforms/ConstraintElimination/monotonic-int-phis-adjacent-loops.ll b/llvm/test/Transforms/ConstraintElimination/monotonic-phis-adjacent-loops.ll
similarity index 60%
rename from llvm/test/Transforms/ConstraintElimination/monotonic-int-phis-adjacent-loops.ll
rename to llvm/test/Transforms/ConstraintElimination/monotonic-phis-adjacent-loops.ll
index 2df668a22050a3e..51f08adae09cdcd 100644
--- a/llvm/test/Transforms/ConstraintElimination/monotonic-int-phis-adjacent-loops.ll
+++ b/llvm/test/Transforms/ConstraintElimination/monotonic-phis-adjacent-loops.ll
@@ -23,7 +23,8 @@ define void @test_loop_add_rec_used_in_adjacent_loop(i8 %len.n, i16 %a) {
 ; CHECK-NEXT:    [[C:%.*]] = icmp eq i16 [[IV_2]], [[LEN]]
 ; CHECK-NEXT:    br i1 [[C]], label [[EXIT]], label [[FOR_BODY:%.*]]
 ; CHECK:       for.body:
-; CHECK-NEXT:    [[AND:%.*]] = and i1 true, true
+; CHECK-NEXT:    [[T_2:%.*]] = icmp ult i16 [[IV_2]], [[A]]
+; CHECK-NEXT:    [[AND:%.*]] = and i1 true, [[T_2]]
 ; CHECK-NEXT:    br i1 [[AND]], label [[LOOP_2_LATCH]], label [[EXIT]]
 ; CHECK:       loop.2.latch:
 ; CHECK-NEXT:    call void @use(i16 [[IV_2]])
@@ -63,3 +64,41 @@ loop.2.latch:
 exit:
   ret void
 }
+
+define void @test_adjacen_loops_pointer_iv_crash() {
+; CHECK-LABEL: @test_adjacen_loops_pointer_iv_crash(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    br label [[LOOP_1:%.*]]
+; CHECK:       loop.1:
+; CHECK-NEXT:    [[IV_1:%.*]] = phi ptr [ null, [[ENTRY:%.*]] ], [ [[IV_1_NEXT:%.*]], [[LOOP_1]] ]
+; CHECK-NEXT:    [[IV_1_NEXT]] = getelementptr ptr, ptr [[IV_1]], i32 1
+; CHECK-NEXT:    br i1 false, label [[LOOP_1]], label [[LOOP_2:%.*]]
+; CHECK:       loop.2:
+; CHECK-NEXT:    [[__FIRST_ADDR_1_LCSSA:%.*]] = phi ptr [ [[IV_1]], [[LOOP_1]] ], [ [[IV_1]], [[LOOP_2_LATCH:%.*]] ]
+; CHECK-NEXT:    [[CMP7:%.*]] = icmp eq ptr [[__FIRST_ADDR_1_LCSSA]], null
+; CHECK-NEXT:    br i1 [[CMP7]], label [[IF_THEN8:%.*]], label [[LOOP_2_LATCH]]
+; CHECK:       if.then8:
+; CHECK-NEXT:    ret void
+; CHECK:       loop.2.latch:
+; CHECK-NEXT:    br label [[LOOP_2]]
+;
+entry:
+  br label %loop.1
+
+loop.1:
+  %iv.1 = phi ptr [ null, %entry ], [ %iv.1.next, %loop.1 ]
+  %iv.1.next = getelementptr ptr, ptr %iv.1, i32 1
+  br i1 false, label %loop.1, label %loop.2
+
+loop.2:
+  %__first.addr.1.lcssa = phi ptr [ %iv.1, %loop.1 ], [ %iv.1, %loop.2.latch ]
+  %cmp7 = icmp eq ptr %__first.addr.1.lcssa, null
+  br i1 %cmp7, label %if.then8, label %loop.2.latch
+
+if.then8:                                         ; preds = %do.body
+  ret void
+
+loop.2.latch:
+  br label %loop.2
+}
+