From 04aa2c3520c049333ca216fb794d700310c4a33d Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Fri, 24 Oct 2008 06:14:27 +0000 Subject: [PATCH] Don't try to create a mask when we don't need one. Fixes a crash. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58075 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/ConstantFolding.cpp | 10 ++++++---- test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp index d3d0eb61ec1..9f94ee38337 100644 --- a/lib/Analysis/ConstantFolding.cpp +++ b/lib/Analysis/ConstantFolding.cpp @@ -368,10 +368,12 @@ Constant *llvm::ConstantFoldInstOperands(unsigned Opcode, const Type *DestTy, if (TD && CE->getOpcode() == Instruction::IntToPtr) { Constant *Input = CE->getOperand(0); unsigned InWidth = Input->getType()->getPrimitiveSizeInBits(); - Constant *Mask = - ConstantInt::get(APInt::getLowBitsSet(InWidth, - TD->getPointerSizeInBits())); - Input = ConstantExpr::getAnd(Input, Mask); + if (TD->getPointerSizeInBits() < InWidth) { + Constant *Mask = + ConstantInt::get(APInt::getLowBitsSet(InWidth, + TD->getPointerSizeInBits())); + Input = ConstantExpr::getAnd(Input, Mask); + } // Do a zext or trunc to get to the dest size. return ConstantExpr::getIntegerCast(Input, DestTy, false); } diff --git a/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll b/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll new file mode 100644 index 00000000000..8f35a8586c7 --- /dev/null +++ b/test/Transforms/InstCombine/2008-10-23-ConstFoldWithoutMask.ll @@ -0,0 +1,8 @@ +; RUN: llvm-as < %s | opt -instcombine +; PR2940 + +define i32 @tstid() { + %var0 = inttoptr i32 1 to i8* ; [#uses=1] + %var2 = ptrtoint i8* %var0 to i32 ; [#uses=1] + ret i32 %var2 +} -- 2.11.0