[llvm-branch-commits] [llvm-branch] r223646 - I did not intend to merge these in.

[David Majnemer]

Author: majnemer
Date: Mon Dec  8 03:15:41 2014
New Revision: 223646

URL: http://llvm.org/viewvc/llvm-project?rev=223646&view=rev
Log:
I did not intend to merge these in.

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/include/llvm/IR/Constant.h
    llvm/branches/release_35/lib/IR/Constants.cpp
    llvm/branches/release_35/lib/Transforms/InstCombine/InstCombineAddSub.cpp
    llvm/branches/release_35/test/Transforms/InstCombine/sub.ll

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  8 03:15:41 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798-213799,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214060,214129,214180,214287,214331,214385,214423,214429,214519,214670,214674,214679,215685,215711,215806,215818,216064,216262,216531,216891,216920,217102,217115,217257,218745,221009,221408,221453,221501,222338,222376,222500,223163,223170-223171
+/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798-213799,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214060,214129,214180,214287,214331,214423,214429,214519,214670,214674,214679,215685,215711,215806,216064,216262,216531,216891,216920,217102,217115,217257,218745,221009,221408,221453,221501,222338,222376,222500,223163,223170-223171

Modified: llvm/branches/release_35/include/llvm/IR/Constant.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/include/llvm/IR/Constant.h?rev=223646&r1=223645&r2=223646&view=diff
==============================================================================
--- llvm/branches/release_35/include/llvm/IR/Constant.h (original)
+++ llvm/branches/release_35/include/llvm/IR/Constant.h Mon Dec  8 03:15:41 2014
@@ -53,9 +53,6 @@ public:
   /// getNullValue.
   bool isNullValue() const;
 
-  /// \brief Returns true if the value is one.
-  bool isOneValue() const;
-
   /// isAllOnesValue - Return true if this is the value that would be returned by
   /// getAllOnesValue.
   bool isAllOnesValue() const;

Modified: llvm/branches/release_35/lib/IR/Constants.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/IR/Constants.cpp?rev=223646&r1=223645&r2=223646&view=diff
==============================================================================
--- llvm/branches/release_35/lib/IR/Constants.cpp (original)
+++ llvm/branches/release_35/lib/IR/Constants.cpp Mon Dec  8 03:15:41 2014
@@ -107,28 +107,6 @@ bool Constant::isAllOnesValue() const {
   return false;
 }
 
-bool Constant::isOneValue() const {
-  // Check for 1 integers
-  if (const ConstantInt *CI = dyn_cast<ConstantInt>(this))
-    return CI->isOne();
-
-  // Check for FP which are bitcasted from 1 integers
-  if (const ConstantFP *CFP = dyn_cast<ConstantFP>(this))
-    return CFP->getValueAPF().bitcastToAPInt() == 1;
-
-  // Check for constant vectors which are splats of 1 values.
-  if (const ConstantVector *CV = dyn_cast<ConstantVector>(this))
-    if (Constant *Splat = CV->getSplatValue())
-      return Splat->isOneValue();
-
-  // Check for constant vectors which are splats of 1 values.
-  if (const ConstantDataVector *CV = dyn_cast<ConstantDataVector>(this))
-    if (Constant *Splat = CV->getSplatValue())
-      return Splat->isOneValue();
-
-  return false;
-}
-
 bool Constant::isMinSignedValue() const {
   // Check for INT_MIN integers
   if (const ConstantInt *CI = dyn_cast<ConstantInt>(this))

Modified: llvm/branches/release_35/lib/Transforms/InstCombine/InstCombineAddSub.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Transforms/InstCombine/InstCombineAddSub.cpp?rev=223646&r1=223645&r2=223646&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Transforms/InstCombine/InstCombineAddSub.cpp (original)
+++ llvm/branches/release_35/lib/Transforms/InstCombine/InstCombineAddSub.cpp Mon Dec  8 03:15:41 2014
@@ -1462,17 +1462,11 @@ Instruction *InstCombiner::visitSub(Bina
   if (Value *V = SimplifyUsingDistributiveLaws(I))
     return ReplaceInstUsesWith(I, V);
 
-  // If this is a 'B = x-(-A)', change to B = x+A.
+  // If this is a 'B = x-(-A)', change to B = x+A.  This preserves NSW/NUW.
   if (Value *V = dyn_castNegVal(Op1)) {
     BinaryOperator *Res = BinaryOperator::CreateAdd(Op0, V);
-
-    if (const auto *BO = dyn_cast<BinaryOperator>(Op1)) {
-      assert(BO->getOpcode() == Instruction::Sub &&
-             "Expected a subtraction operator!");
-      if (BO->hasNoSignedWrap() && I.hasNoSignedWrap())
-        Res->setHasNoSignedWrap(true);
-    }
-
+    Res->setHasNoSignedWrap(I.hasNoSignedWrap());
+    Res->setHasNoUnsignedWrap(I.hasNoUnsignedWrap());
     return Res;
   }
 
@@ -1561,7 +1555,7 @@ Instruction *InstCombiner::visitSub(Bina
 
     // 0 - (X sdiv C)  -> (X sdiv -C)  provided the negation doesn't overflow.
     if (match(Op1, m_SDiv(m_Value(X), m_Constant(C))) && match(Op0, m_Zero()) &&
-        !C->isMinSignedValue() && !C->isOneValue())
+        !C->isMinSignedValue())
       return BinaryOperator::CreateSDiv(X, ConstantExpr::getNeg(C));
 
     // 0 - (X << Y)  -> (-X << Y)   when X is freely negatable.

Modified: llvm/branches/release_35/test/Transforms/InstCombine/sub.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/Transforms/InstCombine/sub.ll?rev=223646&r1=223645&r2=223646&view=diff
==============================================================================
--- llvm/branches/release_35/test/Transforms/InstCombine/sub.ll (original)
+++ llvm/branches/release_35/test/Transforms/InstCombine/sub.ll Mon Dec  8 03:15:41 2014
@@ -464,12 +464,3 @@ define i32 @test38(i32 %A) {
 ; CHECK-NEXT: [[SEXT:%.*]] = sext i1 [[ICMP]] to i32
 ; CHECK-NEXT: ret i32 [[SEXT]]
 }
-
-define i32 @test39(i32 %A, i32 %x) {
-  %B = sub i32 0, %A
-  %C = sub nsw i32 %x, %B
-  ret i32 %C
-; CHECK-LABEL: @test39(
-; CHECK: %C = add i32 %x, %A
-; CHECK: ret i32 %C
-}