commit 7c90b90f4e9b0c421f0e45d7de03f6edce113a90
author Chris Lattner <sabre@nondot.org> Tue Jan 04 00:06:55 2011 +0000
committer Chris Lattner <sabre@nondot.org> Tue Jan 04 00:06:55 2011 +0000
tree e41d639ba8f4b10b84a7af7dfae48e122a1fa14b
parent 2c502f915f52aab994fce7d3e78d1d021321d7a5

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

lib/Transforms/Scalar/LoopIdiomRecognize.cpp

diff --git a/lib/Transforms/Scalar/LoopIdiomRecognize.cpp b/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
index 52fc263..fc70775 100644
--- a/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
+++ b/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
@@ -349,17 +349,13 @@
   // 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 @@
   // 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());