Commit 755a21f3 authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Fixing patch mistake. 

llvm-svn: 37303
parent 688d4d27

llvm/lib/Transforms/Scalar/InstructionCombining.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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.