[llvm-branch-commits] [llvm-branch] r223645 - Merging r215818:

[David Majnemer]

Author: majnemer
Date: Mon Dec  8 03:11:48 2014
New Revision: 223645

URL: http://llvm.org/viewvc/llvm-project?rev=223645&view=rev
Log:
Merging r215818:
------------------------------------------------------------------------
r215818 | majnemer | 2014-08-16 02:23:42 -0700 (Sat, 16 Aug 2014) | 12 lines

InstCombine: Fix a potential bug in 0 - (X sdiv C)  -> (X sdiv -C)

While *most* (X sdiv 1) operations will get caught by InstSimplify, it
is still possible for a sdiv to appear in the worklist which hasn't been
simplified yet.

This means that it is possible for 0 - (X sdiv 1) to get transformed
into (X sdiv -1); dividing by -1 can make the transform produce undef
values instead of the proper result.

Sorry for the lack of testcase, it's a bit problematic because it relies
on the exact order of operations in the worklist.
------------------------------------------------------------------------

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

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  8 03:11:48 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,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,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

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=223645&r1=223644&r2=223645&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:11:48 2014
@@ -53,6 +53,9 @@ 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=223645&r1=223644&r2=223645&view=diff
==============================================================================
--- llvm/branches/release_35/lib/IR/Constants.cpp (original)
+++ llvm/branches/release_35/lib/IR/Constants.cpp Mon Dec  8 03:11:48 2014
@@ -107,6 +107,28 @@ 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=223645&r1=223644&r2=223645&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:11:48 2014
@@ -1561,7 +1561,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->isMinSignedValue() && !C->isOneValue())
       return BinaryOperator::CreateSDiv(X, ConstantExpr::getNeg(C));
 
     // 0 - (X << Y)  -> (-X << Y)   when X is freely negatable.