use the very-handy getTruncateOrZeroExtend helper function, and

stop setting NSW: signed overflow is possible.  Thanks to Dan
for pointing these out.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122790 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/LoopIdiomRecognize.cpp b/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
index 52fc2636ac33a13aa89df5f8f759218236fe9c22..fc707755e9d275156b512904c879f5e7139f7f72 100644 (file)
--- a/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
+++ b/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
@@ -349,17 +349,13 @@ processLoopStoreOfSplatValue(StoreInst *SI, unsigned StoreSize,
   // The # stored bytes is (BECount+1)*Size.  Expand the trip count out to
   // pointer size if it isn't already.
   const Type *IntPtr = TD->getIntPtrType(SI->getContext());
-  unsigned BESize = SE->getTypeSizeInBits(BECount->getType());
-  if (BESize < TD->getPointerSizeInBits())
-    BECount = SE->getZeroExtendExpr(BECount, IntPtr);
-  else if (BESize > TD->getPointerSizeInBits())
-    BECount = SE->getTruncateExpr(BECount, IntPtr);
+  BECount = SE->getTruncateOrZeroExtend(BECount, IntPtr);
   
   const SCEV *NumBytesS = SE->getAddExpr(BECount, SE->getConstant(IntPtr, 1),
-                                         true, true /*nooverflow*/);
+                                         true /*no unsigned overflow*/);
   if (StoreSize != 1)
     NumBytesS = SE->getMulExpr(NumBytesS, SE->getConstant(IntPtr, StoreSize),
-                               true, true /*nooverflow*/);
+                               true /*no unsigned overflow*/);
   
   Value *NumBytes = 
     Expander.expandCodeFor(NumBytesS, IntPtr, Preheader->getTerminator());
@@ -426,17 +422,13 @@ processLoopStoreOfLoopLoad(StoreInst *SI, unsigned StoreSize,
   // The # stored bytes is (BECount+1)*Size.  Expand the trip count out to
   // pointer size if it isn't already.
   const Type *IntPtr = TD->getIntPtrType(SI->getContext());
-  unsigned BESize = SE->getTypeSizeInBits(BECount->getType());
-  if (BESize < TD->getPointerSizeInBits())
-    BECount = SE->getZeroExtendExpr(BECount, IntPtr);
-  else if (BESize > TD->getPointerSizeInBits())
-    BECount = SE->getTruncateExpr(BECount, IntPtr);
+  BECount = SE->getTruncateOrZeroExtend(BECount, IntPtr);
   
   const SCEV *NumBytesS = SE->getAddExpr(BECount, SE->getConstant(IntPtr, 1),
-                                         true, true /*nooverflow*/);
+                                         true /*no unsigned overflow*/);
   if (StoreSize != 1)
     NumBytesS = SE->getMulExpr(NumBytesS, SE->getConstant(IntPtr, StoreSize),
-                               true, true /*nooverflow*/);
+                               true /*no unsigned overflow*/);
   
   Value *NumBytes =
     Expander.expandCodeFor(NumBytesS, IntPtr, Preheader->getTerminator());