diff --git a/llvm/include/llvm/Analysis/ValueLattice.h b/llvm/include/llvm/Analysis/ValueLattice.h --- a/llvm/include/llvm/Analysis/ValueLattice.h +++ b/llvm/include/llvm/Analysis/ValueLattice.h @@ -250,8 +250,22 @@ /// Updates this object to approximate both this object and RHS. Returns /// true if this object has been changed. bool mergeIn(const ValueLatticeElement &RHS, const DataLayout &DL) { - if (RHS.isUndefined() || isOverdefined()) + if (isOverdefined()) + return false; + + if (RHS.isUndefined()) { + // If we merge a non-singleton range with an undefined element, we have to + // go to overdefined, because it could be undef and we have to treat undef + // as overdefined, because we will not be able to replace all uses. Note + // that for constants (or single-element ranges), we will replace all uses + // and we can assume undef == other constant. + if (isConstantRange() && !getConstantRange().isSingleElement()) { + markOverdefined(); + return true; + } return false; + } + if (RHS.isOverdefined()) { markOverdefined(); return true; diff --git a/llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll b/llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll new file mode 100644 --- /dev/null +++ b/llvm/test/Transforms/CorrelatedValuePropagation/merge-range-and-undef.ll @@ -0,0 +1,148 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py +; RUN: opt -S -correlated-propagation %s | FileCheck %s + +; Test case for PR44949. + +; We can remove `%res = and i64 %p, 255`, because %r = 0 and we can eliminate +; %p as well. +define i64 @constant_and_undef(i1 %c1, i64 %a) { +; CHECK-LABEL: @constant_and_undef( +; CHECK-NEXT: entry: +; CHECK-NEXT: br i1 [[C1:%.*]], label [[BB1:%.*]], label [[BB2:%.*]] +; CHECK: bb1: +; CHECK-NEXT: br label [[BB3:%.*]] +; CHECK: bb2: +; CHECK-NEXT: [[R:%.*]] = and i64 [[A:%.*]], 0 +; CHECK-NEXT: br label [[BB3]] +; CHECK: bb3: +; CHECK-NEXT: ret i64 0 +; +entry: + br i1 %c1, label %bb1, label %bb2 + +bb1: + br label %bb3 + +bb2: + %r = and i64 %a, 0 + br label %bb3 + +bb3: + %p = phi i64 [ undef, %bb1 ], [ %r, %bb2 ] + %res = and i64 %p, 255 + ret i64 %res +} + +; Check that we go to overdefined when merging a constant range with undef. We +; cannot remove '%res = and i64 %p, 255'. +define i64 @constant_range_and_undef(i1 %cond, i64 %a) { +; CHECK-LABEL: @constant_range_and_undef( +; CHECK-NEXT: entry: +; CHECK-NEXT: br i1 [[COND:%.*]], label [[BB1:%.*]], label [[BB2:%.*]] +; CHECK: bb1: +; CHECK-NEXT: br label [[BB3:%.*]] +; CHECK: bb2: +; CHECK-NEXT: [[R:%.*]] = and i64 [[A:%.*]], 255 +; CHECK-NEXT: br label [[BB3]] +; CHECK: bb3: +; CHECK-NEXT: [[P:%.*]] = phi i64 [ undef, [[BB1]] ], [ [[R]], [[BB2]] ] +; CHECK-NEXT: ret i64 [[P]] +; +entry: + br i1 %cond, label %bb1, label %bb2 + +bb1: + br label %bb3 + +bb2: + %r = and i64 %a, 255 + br label %bb3 + +bb3: + %p = phi i64 [ undef, %bb1 ], [ %r, %bb2 ] + %res = and i64 %p, 255 + ret i64 %res +} + +define i64 @constant_range_and_undef2(i1 %c1, i1 %c2, i64 %a) { +; CHECK-LABEL: @constant_range_and_undef2( +; CHECK-NEXT: entry: +; CHECK-NEXT: br i1 [[C1:%.*]], label [[BB1:%.*]], label [[BB2:%.*]] +; CHECK: bb1: +; CHECK-NEXT: [[V1:%.*]] = add nuw nsw i64 undef, undef +; CHECK-NEXT: br label [[BB3:%.*]] +; CHECK: bb2: +; CHECK-NEXT: [[V2:%.*]] = and i64 [[A:%.*]], 255 +; CHECK-NEXT: br label [[BB3]] +; CHECK: bb3: +; CHECK-NEXT: [[P:%.*]] = phi i64 [ [[V1]], [[BB1]] ], [ [[V2]], [[BB2]] ] +; CHECK-NEXT: br i1 [[C2:%.*]], label [[BB4:%.*]], label [[BB5:%.*]] +; CHECK: bb4: +; CHECK-NEXT: br label [[BB6:%.*]] +; CHECK: bb5: +; CHECK-NEXT: [[V3:%.*]] = and i64 [[A]], 255 +; CHECK-NEXT: br label [[BB6]] +; CHECK: bb6: +; CHECK-NEXT: [[P2:%.*]] = phi i64 [ [[P]], [[BB4]] ], [ [[V3]], [[BB5]] ] +; CHECK-NEXT: [[RES:%.*]] = and i64 [[P2]], 255 +; CHECK-NEXT: ret i64 [[RES]] +; +entry: + br i1 %c1, label %bb1, label %bb2 + +bb1: + %v1 = add i64 undef, undef + br label %bb3 + +bb2: + %v2 = and i64 %a, 255 + br label %bb3 + +bb3: + %p = phi i64 [ %v1, %bb1 ], [ %v2, %bb2 ] + br i1 %c2, label %bb4, label %bb5 + +bb4: + br label %bb6 + +bb5: + %v3 = and i64 %a, 255 + br label %bb6 + +bb6: + %p2 = phi i64 [ %p, %bb4 ], [ %v3, %bb5 ] + %res = and i64 %p2, 255 + ret i64 %res +} + +define i1 @constant_range_and_undef_3(i1 %cond, i64 %a) { +; CHECK-LABEL: @constant_range_and_undef_3( +; CHECK-NEXT: entry: +; CHECK-NEXT: br i1 [[COND:%.*]], label [[BB1:%.*]], label [[BB2:%.*]] +; CHECK: bb1: +; CHECK-NEXT: br label [[BB3:%.*]] +; CHECK: bb2: +; CHECK-NEXT: [[R:%.*]] = and i64 [[A:%.*]], 255 +; CHECK-NEXT: br label [[BB3]] +; CHECK: bb3: +; CHECK-NEXT: [[P:%.*]] = phi i64 [ undef, [[BB1]] ], [ [[R]], [[BB2]] ] +; CHECK-NEXT: [[C:%.*]] = icmp ult i64 [[P]], 256 +; CHECK-NEXT: ret i1 [[C]] +; +entry: + br i1 %cond, label %bb1, label %bb2 + +bb1: + br label %bb3 + +bb2: + %r = and i64 %a, 255 + br label %bb3 + +bb3: + %p = phi i64 [ undef, %bb1 ], [ %r, %bb2 ] + %c = icmp ult i64 %p, 256 + ret i1 %c +} + +