[llvm-commits] [llvm] r133301 - /llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp

[Chad Rosier]

Author: mcrosier
Date: Fri Jun 17 17:08:25 2011
New Revision: 133301

URL: http://llvm.org/viewvc/llvm-project?rev=133301&view=rev
Log:
Revert r133285.  Causing odd failures on Dragonegg.

Modified:
    llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp

Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp?rev=133301&r1=133300&r2=133301&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCasts.cpp Fri Jun 17 17:08:25 2011
@@ -29,10 +29,6 @@
     return ConstantInt::get(Val->getType(), 0);
   }
   
-  // Insist that the amount-to-allocate not overflow.
-  OverflowingBinaryOperator *OBI = dyn_cast<OverflowingBinaryOperator>(Val);
-  if (OBI && !OBI->hasNoUnsignedWrap()) return 0;
-
   if (BinaryOperator *I = dyn_cast<BinaryOperator>(Val)) {
     if (ConstantInt *RHS = dyn_cast<ConstantInt>(I->getOperand(1))) {
       if (I->getOpcode() == Instruction::Shl) {
@@ -75,6 +71,11 @@
   // This requires TargetData to get the alloca alignment and size information.
   if (!TD) return 0;
 
+  // Insist that the amount-to-allocate not overflow.
+  OverflowingBinaryOperator *OBI =
+    dyn_cast<OverflowingBinaryOperator>(AI.getOperand(0));
+  if (OBI && !(OBI->hasNoSignedWrap() || OBI->hasNoUnsignedWrap())) return 0;
+
   const PointerType *PTy = cast<PointerType>(CI.getType());
   
   BuilderTy AllocaBuilder(*Builder);