summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2015-04-22 20:59:28 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2015-04-22 20:59:28 +0000
commit3bd87826e5a29b3d4870287bc16d03c52c451be8 (patch)
tree4f3380c0219d2c16d6cb343472ee86c9ff6fce0d
parent62682bceb3a3291e26bb5958a5efa7a2c8b411c7 (diff)
[InstCombine] Clear out nsw/nuw if we modify computation in the chain
An nsw/nuw operation relies on the values feeding into it to not overflow if 'poison' is not to be produced. This means that optimizations which make modifications to the bottom of a chain (like SimplifyDemandedBits) must strip out nsw/nuw if they cannot ensure that they will be preserved. This fixes PR23309. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235544 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp13
-rw-r--r--test/Transforms/InstCombine/cast.ll12
2 files changed, 22 insertions, 3 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp b/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp
index cd391d0385..0695ec17e3 100644
--- a/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp
+++ b/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp
@@ -83,11 +83,18 @@ bool InstCombiner::SimplifyDemandedInstructionBits(Instruction &Inst) {
bool InstCombiner::SimplifyDemandedBits(Use &U, APInt DemandedMask,
APInt &KnownZero, APInt &KnownOne,
unsigned Depth) {
- Value *NewVal =
- SimplifyDemandedUseBits(U.get(), DemandedMask, KnownZero, KnownOne, Depth,
- dyn_cast<Instruction>(U.getUser()));
+ auto *UserI = dyn_cast<Instruction>(U.getUser());
+ Value *NewVal = SimplifyDemandedUseBits(U.get(), DemandedMask, KnownZero,
+ KnownOne, Depth, UserI);
if (!NewVal) return false;
U = NewVal;
+
+ // Shrinking a constant might cause a nsw/nuw violation to occur in
+ // instructions which are themselves demanded.
+ if (auto *UserOBO = dyn_cast<OverflowingBinaryOperator>(UserI)) {
+ cast<BinaryOperator>(UserOBO)->setHasNoSignedWrap(false);
+ cast<BinaryOperator>(UserOBO)->setHasNoUnsignedWrap(false);
+ }
return true;
}
diff --git a/test/Transforms/InstCombine/cast.ll b/test/Transforms/InstCombine/cast.ll
index d4356d9364..7bf4a6047f 100644
--- a/test/Transforms/InstCombine/cast.ll
+++ b/test/Transforms/InstCombine/cast.ll
@@ -1113,3 +1113,15 @@ define float @sitofp_zext(i16 %a) {
%sitofp = sitofp i32 %zext to float
ret float %sitofp
}
+
+define i1 @PR23309(i32 %A, i32 %B) {
+; CHECK-LABEL: @PR23309(
+; CHECK-NEXT: %[[sub:.*]] = sub i32 %A, %B
+; CHECK-NEXT: %[[and:.*]] = and i32 %[[sub]], 1
+; CHECK-NEXT: %[[cmp:.*]] = icmp ne i32 %[[and]], 0
+; CHECK-NEXT: ret i1 %[[cmp]]
+ %add = add i32 %A, -4
+ %sub = sub nsw i32 %add, %B
+ %trunc = trunc i32 %sub to i1
+ ret i1 %trunc
+}