diff options
| author | Chris Lattner <sabre@nondot.org> | 2007-01-06 19:53:32 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2007-01-06 19:53:32 +0000 |
| commit | 46013f40444ead22627d1a0d97293cba7bf76e8e (patch) | |
| tree | 9340ae32afa11b606dac7cfa4f20f81aff401386 | |
| parent | cea9d1d634fd5a952ee51a5e0dc1d5a094d9b6da (diff) | |
Fix regressions in InstCombine/call-cast-target.ll and InstCombine/2003-11-13-ConstExprCastCall.ll
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32959 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Scalar/InstructionCombining.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index 9bdf0d8d38..66fbe1482d 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -7208,7 +7208,10 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) { // Check to see if we are changing the return type... if (OldRetTy != FT->getReturnType()) { if (Callee->isExternal() && !Caller->use_empty() && - OldRetTy != FT->getReturnType()) + OldRetTy != FT->getReturnType() && + // Conversion is ok if changing from pointer to int of same size. + !(isa<PointerType>(FT->getReturnType()) && + TD->getIntPtrType() == OldRetTy)) return false; // Cannot transform this return value. // If the callsite is an invoke instruction, and the return value is used by @@ -7235,6 +7238,7 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) { ConstantInt *c = dyn_cast<ConstantInt>(*AI); //Either we can cast directly, or we can upconvert the argument bool isConvertible = ActTy == ParamTy || + (isa<PointerType>(ParamTy) && isa<PointerType>(ActTy)) || (ParamTy->isIntegral() && ActTy->isIntegral() && ParamTy->getPrimitiveSize() >= ActTy->getPrimitiveSize()) || (c && ParamTy->getPrimitiveSize() >= ActTy->getPrimitiveSize() && |