From 3761c34e03a1220f0cc2ee7df31feeec5ee7e15c Mon Sep 17 00:00:00 2001 From: Stuart Hastings Date: Fri, 17 Jun 2011 20:21:52 +0000 Subject: Relocate NUW test to cover all binary ops in a dynamic alloca expr. Followup to 132926. rdar://problem/9265821 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133285 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/InstCombine/InstCombineCasts.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/Transforms/InstCombine/InstCombineCasts.cpp') diff --git a/lib/Transforms/InstCombine/InstCombineCasts.cpp b/lib/Transforms/InstCombine/InstCombineCasts.cpp index 601d9b42f3..48a747d764 100644 --- a/lib/Transforms/InstCombine/InstCombineCasts.cpp +++ b/lib/Transforms/InstCombine/InstCombineCasts.cpp @@ -29,6 +29,10 @@ 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) { @@ -71,11 +75,6 @@ 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); -- cgit v1.2.3-18-g5258