From bc336eab6e200f894137ab52c9d1f2fe5d61dbd6 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 1 May 2009 17:00:00 +0000 Subject: [PATCH] Short-circuit inttoptr-ptrtoint constant expressions; these aren't always folded by the regular constant folder because it doesn't have TargetData information. llvm-svn: 70553 --- lib/Analysis/ScalarEvolutionExpander.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/Analysis/ScalarEvolutionExpander.cpp b/lib/Analysis/ScalarEvolutionExpander.cpp index 9676ea20af5..be91c0d7249 100644 --- a/lib/Analysis/ScalarEvolutionExpander.cpp +++ b/lib/Analysis/ScalarEvolutionExpander.cpp @@ -27,13 +27,20 @@ Value *SCEVExpander::InsertCastOfTo(Instruction::CastOps opcode, Value *V, // Short-circuit unnecessary inttoptr<->ptrtoint casts. if ((opcode == Instruction::PtrToInt || opcode == Instruction::IntToPtr) && - SE.getTypeSizeInBits(Ty) == SE.getTypeSizeInBits(V->getType())) + SE.getTypeSizeInBits(Ty) == SE.getTypeSizeInBits(V->getType())) { if (CastInst *CI = dyn_cast(V)) if ((CI->getOpcode() == Instruction::PtrToInt || CI->getOpcode() == Instruction::IntToPtr) && SE.getTypeSizeInBits(CI->getType()) == SE.getTypeSizeInBits(CI->getOperand(0)->getType())) return CI->getOperand(0); + if (ConstantExpr *CE = dyn_cast(V)) + if ((CE->getOpcode() == Instruction::PtrToInt || + CE->getOpcode() == Instruction::IntToPtr) && + SE.getTypeSizeInBits(CE->getType()) == + SE.getTypeSizeInBits(CE->getOperand(0)->getType())) + return CE->getOperand(0); + } // FIXME: keep track of the cast instruction. if (Constant *C = dyn_cast(V))