diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp --- a/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/llvm/lib/Analysis/ScalarEvolution.cpp @@ -5664,17 +5664,18 @@ if (!P) return CR; + // Make sure that no Phi input comes from an unreachable block. Otherwise, + // even the values that are not available in these blocks may come from them, + // and this leads to false-positive recurrence test. + for (auto *Pred : predecessors(P->getParent())) + if (!DT.isReachableFromEntry(Pred)) + return CR; + BinaryOperator *BO; Value *Start, *Step; if (!matchSimpleRecurrence(P, BO, Start, Step)) return CR; - if (!DT.isReachableFromEntry(P->getParent()) || - !DT.isReachableFromEntry(BO->getParent())) - // If either is in unreachable code, dominance collapses and none of our - // expected post conditions about loops hold. - return CR; - // If we found a recurrence in reachable code, we must be in a loop. Note // that BO might be in some subloop of L, and that's completely okay. auto *L = LI.getLoopFor(P->getParent()); diff --git a/llvm/test/Analysis/ScalarEvolution/pr49856.ll b/llvm/test/Analysis/ScalarEvolution/pr49856.ll new file mode 100644 --- /dev/null +++ b/llvm/test/Analysis/ScalarEvolution/pr49856.ll @@ -0,0 +1,24 @@ +; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s + +define void @test() { +; CHECK-LABEL: 'test' +; CHECK-NEXT: Classifying expressions for: @test +; CHECK-NEXT: %tmp = phi i32 [ 2, %bb ], [ %tmp2, %bb3 ] +; CHECK-NEXT: --> %tmp U: [1,-2147483648) S: [0,-2147483648) +; CHECK-NEXT: %tmp2 = add nuw nsw i32 %tmp, 1 +; CHECK-NEXT: --> (1 + %tmp) U: [1,-2147483647) S: [1,-2147483647) +; CHECK-NEXT: Determining loop execution counts for: @test +; +bb: + br label %bb1 + +bb1: ; preds = %bb3, %bb + %tmp = phi i32 [ 2, %bb ], [ %tmp2, %bb3 ] + %tmp2 = add nuw nsw i32 %tmp, 1 + ret void + +bb3: ; No predecessors! + br label %bb1 +}