diff options
Diffstat (limited to 'lib/Transforms/Scalar/InstructionCombining.cpp')
| -rw-r--r-- | lib/Transforms/Scalar/InstructionCombining.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index 256b2fd41a..482e1722c9 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -7767,11 +7767,6 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) { const FunctionType *FT = Callee->getFunctionType(); const Type *OldRetTy = Caller->getType(); - // Check to see if we are changing the return type... - if (OldRetTy != FT->getReturnType()) { - if (Callee->isDeclaration() && !Caller->use_empty() && - // Conversion is ok if changing from pointer to int of same size. - !(isa<PointerType>(FT->getReturnType()) && const FunctionType *ActualFT = cast<FunctionType>(cast<PointerType>(CE->getType())->getElementType()); @@ -7780,6 +7775,11 @@ bool InstCombiner::transformConstExprCastCall(CallSite CS) { if (FT->getParamAttrs() != ActualFT->getParamAttrs()) return false; + // Check to see if we are changing the return type... + if (OldRetTy != FT->getReturnType()) { + if (Callee->isDeclaration() && !Caller->use_empty() && + // 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. |