Skip to content

Commit 3ff9d92

Browse files
dtcxzywtru
authored andcommitted
[ConstraintElim] Fix miscompilation caused by PR97974 (#105790)
Fixes #105785. (cherry picked from commit 85b6aac)
1 parent 1241c76 commit 3ff9d92

File tree

2 files changed

+47
-1
lines changed

2 files changed

+47
-1
lines changed

llvm/lib/Transforms/Scalar/ConstraintElimination.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ static bool checkAndReplaceCmp(CmpIntrinsic *I, ConstraintInfo &Info,
14641464
ToRemove.push_back(I);
14651465
return true;
14661466
}
1467-
if (checkCondition(ICmpInst::ICMP_EQ, LHS, RHS, I, Info)) {
1467+
if (checkCondition(ICmpInst::ICMP_EQ, LHS, RHS, I, Info).value_or(false)) {
14681468
I->replaceAllUsesWith(ConstantInt::get(I->getType(), 0));
14691469
ToRemove.push_back(I);
14701470
return true;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -passes=constraint-elimination -S %s | FileCheck %s
3+
4+
define void @pr105785(ptr %p) {
5+
; CHECK-LABEL: define void @pr105785(
6+
; CHECK-SAME: ptr [[P:%.*]]) {
7+
; CHECK-NEXT: [[ENTRY:.*]]:
8+
; CHECK-NEXT: br label %[[FOR_COND:.*]]
9+
; CHECK: [[FOR_COND]]:
10+
; CHECK-NEXT: [[FOR_IND:%.*]] = phi i32 [ 0, %[[ENTRY]] ], [ 1, %[[FOR_COND1:.*]] ]
11+
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[FOR_IND]], 0
12+
; CHECK-NEXT: br i1 [[CMP]], label %[[FOR_COND1]], label %[[FOR_END6:.*]]
13+
; CHECK: [[FOR_COND1]]:
14+
; CHECK-NEXT: [[FOR_IND2:%.*]] = phi i32 [ [[INC:%.*]], %[[FOR_BODY3:.*]] ], [ 0, %[[FOR_COND]] ]
15+
; CHECK-NEXT: [[CMP2:%.*]] = icmp ult i32 [[FOR_IND2]], 3
16+
; CHECK-NEXT: br i1 [[CMP2]], label %[[FOR_BODY3]], label %[[FOR_COND]]
17+
; CHECK: [[FOR_BODY3]]:
18+
; CHECK-NEXT: [[SCMP:%.*]] = call i32 @llvm.scmp.i32.i32(i32 [[FOR_IND]], i32 1)
19+
; CHECK-NEXT: store i32 [[SCMP]], ptr [[P]], align 4
20+
; CHECK-NEXT: [[INC]] = add nuw nsw i32 [[FOR_IND2]], 1
21+
; CHECK-NEXT: br label %[[FOR_COND1]]
22+
; CHECK: [[FOR_END6]]:
23+
; CHECK-NEXT: ret void
24+
;
25+
entry:
26+
br label %for.cond
27+
28+
for.cond: ; preds = %for.cond1, %entry
29+
%for.ind = phi i32 [ 0, %entry ], [ 1, %for.cond1 ]
30+
%cmp = icmp eq i32 %for.ind, 0
31+
br i1 %cmp, label %for.cond1, label %for.end6
32+
33+
for.cond1: ; preds = %for.cond, %for.body3
34+
%for.ind2 = phi i32 [ %inc, %for.body3 ], [ 0, %for.cond ]
35+
%cmp2 = icmp ult i32 %for.ind2, 3
36+
br i1 %cmp2, label %for.body3, label %for.cond
37+
38+
for.body3: ; preds = %for.cond1
39+
%scmp = call i32 @llvm.scmp.i32.i32(i32 %for.ind, i32 1)
40+
store i32 %scmp, ptr %p, align 4
41+
%inc = add nuw nsw i32 %for.ind2, 1
42+
br label %for.cond1
43+
44+
for.end6:
45+
ret void
46+
}

0 commit comments

Comments
 (0)