diff options
| -rw-r--r-- | lib/CodeGen/CGBlocks.cpp | 6 | ||||
| -rw-r--r-- | lib/CodeGen/CGClass.cpp | 6 | ||||
| -rw-r--r-- | lib/CodeGen/CGVTables.cpp | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index 8edf2eda06..af4f26c427 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -749,11 +749,7 @@ RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr* E, llvm::Value *Func = Builder.CreateLoad(FuncPtr, "tmp"); const FunctionType *FuncTy = FnType->castAs<FunctionType>(); - QualType ResultType = FuncTy->getResultType(); - - const CGFunctionInfo &FnInfo = - CGM.getTypes().getFunctionInfo(ResultType, Args, - FuncTy->getExtInfo()); + const CGFunctionInfo &FnInfo = CGM.getTypes().getFunctionInfo(Args, FuncTy); // Cast the function pointer to the right type. llvm::Type *BlockFTy = diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 2d32b83b12..1acbb0886a 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -1258,10 +1258,8 @@ CodeGenFunction::EmitSynthesizedCXXCopyCtorCall(const CXXConstructorDecl *D, EmitCallArg(Args, *Arg, ArgType); } - QualType ResultType = FPT->getResultType(); - EmitCall(CGM.getTypes().getFunctionInfo(ResultType, Args, - FPT->getExtInfo()), - Callee, ReturnValueSlot(), Args, D); + EmitCall(CGM.getTypes().getFunctionInfo(Args, FPT), Callee, + ReturnValueSlot(), Args, D); } void diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp index b71145fbed..7c93df514a 100644 --- a/lib/CodeGen/CGVTables.cpp +++ b/lib/CodeGen/CGVTables.cpp @@ -2818,7 +2818,7 @@ void CodeGenFunction::GenerateThunk(llvm::Function *Fn, #ifndef NDEBUG const CGFunctionInfo &CallFnInfo = - CGM.getTypes().getFunctionInfo(ResultType, CallArgs, FPT->getExtInfo()); + CGM.getTypes().getFunctionInfo(CallArgs, FPT); assert(CallFnInfo.getRegParm() == FnInfo.getRegParm() && CallFnInfo.isNoReturn() == FnInfo.isNoReturn() && CallFnInfo.getCallingConvention() == FnInfo.getCallingConvention()); |