From 66638b2333f326afd1b3cf35d6fc9b930d276511 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Fri, 17 Jun 2011 22:08:25 +0000 Subject: [PATCH] Revert r133285. Causing odd failures on Dragonegg. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133301 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/InstCombine/InstCombineCasts.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Transforms/InstCombine/InstCombineCasts.cpp b/lib/Transforms/InstCombine/InstCombineCasts.cpp index 48a747d764a..601d9b42f31 100644 --- a/lib/Transforms/InstCombine/InstCombineCasts.cpp +++ b/lib/Transforms/InstCombine/InstCombineCasts.cpp @@ -29,10 +29,6 @@ static Value *DecomposeSimpleLinearExpr(Value *Val, unsigned &Scale, return ConstantInt::get(Val->getType(), 0); } - // Insist that the amount-to-allocate not overflow. - OverflowingBinaryOperator *OBI = dyn_cast(Val); - if (OBI && !OBI->hasNoUnsignedWrap()) return 0; - if (BinaryOperator *I = dyn_cast(Val)) { if (ConstantInt *RHS = dyn_cast(I->getOperand(1))) { if (I->getOpcode() == Instruction::Shl) { @@ -75,6 +71,11 @@ Instruction *InstCombiner::PromoteCastOfAllocation(BitCastInst &CI, // 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(AI.getOperand(0)); + if (OBI && !(OBI->hasNoSignedWrap() || OBI->hasNoUnsignedWrap())) return 0; + const PointerType *PTy = cast(CI.getType()); BuilderTy AllocaBuilder(*Builder);