diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp --- a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -227,7 +227,9 @@ unsigned IterCnt = 0; (void)IterCnt; while (LocalChange) { - assert(IterCnt++ < 1000 && "Iterative simplification didn't converge!"); + if (IterCnt++ > 1000) + break; + // TODO: Fix infinite loop bug when working with widenable condition. LocalChange = false; // Loop over all of the basic blocks and remove them if they are unneeded. diff --git a/llvm/test/Transforms/SimplifyCFG/pr52290.ll b/llvm/test/Transforms/SimplifyCFG/pr52290.ll --- a/llvm/test/Transforms/SimplifyCFG/pr52290.ll +++ b/llvm/test/Transforms/SimplifyCFG/pr52290.ll @@ -1,15 +1,31 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -simplifycfg -S | FileCheck %s ; RUN: opt < %s -passes=simplifycfg -S | FileCheck %s -; XFAIL: * -; REQUIRES: asserts ; FIXME: Fails due to infinite loop in iterativelySimplifyCFG. ; ModuleID = 'test/Transforms/SimplifyCFG/pr-new.ll' source_filename = "test/Transforms/SimplifyCFG/pr-new.ll" define i32 @test(float %arg) gc "statepoint-example" personality i32* ()* @blam { -; CHECK-LABEL: @test +; CHECK-LABEL: @test( +; CHECK-NEXT: bb: +; CHECK-NEXT: [[TMP:%.*]] = call i1 @llvm.experimental.widenable.condition() +; CHECK-NEXT: br i1 [[TMP]], label [[BB2:%.*]], label [[BB1:%.*]] +; CHECK: bb1: +; CHECK-NEXT: br i1 undef, label [[BB7:%.*]], label [[BB5:%.*]] +; CHECK: bb2: +; CHECK-NEXT: [[TMP3:%.*]] = getelementptr inbounds i8, i8 addrspace(1)* undef, i64 16 +; CHECK-NEXT: br i1 undef, label [[BB7]], label [[BB4:%.*]] +; CHECK: bb4: +; CHECK-NEXT: call void @snork() [ "deopt"() ] +; CHECK-NEXT: unreachable +; CHECK: bb5: +; CHECK-NEXT: ret i32 0 +; CHECK: bb7: +; CHECK-NEXT: [[TMP8:%.*]] = call i32 (...) @llvm.experimental.deoptimize.i32(i32 10) [ "deopt"() ] +; CHECK-NEXT: ret i32 [[TMP8]] +; bb: %tmp = call i1 @llvm.experimental.widenable.condition() br i1 %tmp, label %bb2, label %bb1