Skip to content

Commit 08374c2

Browse files
antoniofrighettonikic
authored andcommitted
[InstCombine] Intersect nowrap flags between geps while folding into phi
A miscompilation issue has been addressed with refined checking.
1 parent fde96e6 commit 08374c2

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@ Instruction *InstCombinerImpl::foldPHIArgGEPIntoPHI(PHINode &PN) {
513513
// especially bad when the PHIs are in the header of a loop.
514514
bool NeededPhi = false;
515515

516-
GEPNoWrapFlags NW = GEPNoWrapFlags::all();
516+
// Remember flags of the first phi-operand getelementptr.
517+
GEPNoWrapFlags NW = FirstInst->getNoWrapFlags();
517518

518519
// Scan to see if all operands are the same opcode, and all have one user.
519520
for (Value *V : drop_begin(PN.incoming_values())) {

llvm/test/Transforms/InstCombine/opaque-ptr.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ define ptr @phi_of_gep_flags_1(i1 %c, ptr %p) {
549549
; CHECK: else:
550550
; CHECK-NEXT: br label [[JOIN]]
551551
; CHECK: join:
552-
; CHECK-NEXT: [[PHI:%.*]] = getelementptr nusw nuw i8, ptr [[P:%.*]], i64 4
552+
; CHECK-NEXT: [[PHI:%.*]] = getelementptr nusw i8, ptr [[P:%.*]], i64 4
553553
; CHECK-NEXT: ret ptr [[PHI]]
554554
;
555555
br i1 %c, label %if, label %else

llvm/test/Transforms/InstCombine/phi.ll

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2714,3 +2714,31 @@ join:
27142714
%cmp = icmp slt i32 %13, 0
27152715
ret i1 %cmp
27162716
}
2717+
2718+
define i64 @wrong_gep_arg_into_phi(ptr noundef %ptr) {
2719+
; CHECK-LABEL: @wrong_gep_arg_into_phi(
2720+
; CHECK-NEXT: entry:
2721+
; CHECK-NEXT: br label [[FOR_COND:%.*]]
2722+
; CHECK: for.cond:
2723+
; CHECK-NEXT: [[PTR_PN:%.*]] = phi ptr [ [[PTR:%.*]], [[ENTRY:%.*]] ], [ [[DOTPN:%.*]], [[FOR_COND]] ]
2724+
; CHECK-NEXT: [[DOTPN]] = getelementptr i8, ptr [[PTR_PN]], i64 1
2725+
; CHECK-NEXT: [[VAL:%.*]] = load i8, ptr [[DOTPN]], align 1
2726+
; CHECK-NEXT: [[COND_NOT:%.*]] = icmp eq i8 [[VAL]], 0
2727+
; CHECK-NEXT: br i1 [[COND_NOT]], label [[EXIT:%.*]], label [[FOR_COND]]
2728+
; CHECK: exit:
2729+
; CHECK-NEXT: ret i64 0
2730+
;
2731+
entry:
2732+
%add.ptr = getelementptr i8, ptr %ptr, i64 1
2733+
br label %for.cond
2734+
2735+
for.cond: ; preds = %for.cond, %entry
2736+
%.pn = phi ptr [ %add.ptr, %entry ], [ %incdec.ptr, %for.cond ]
2737+
%val = load i8, ptr %.pn, align 1
2738+
%cond = icmp ne i8 %val, 0
2739+
%incdec.ptr = getelementptr inbounds nuw i8, ptr %.pn, i64 1
2740+
br i1 %cond, label %for.cond, label %exit
2741+
2742+
exit: ; preds = %for.cond
2743+
ret i64 0
2744+
}

0 commit comments

Comments
 (0)