nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assume that a block always has a FunctionProtoType. Fixes rdar://6768379.

Browse Source 
llvm-svn: 68583
This commit is contained in:
Anders Carlsson
2009-04-08 02:55:55 +00:00
parent 9d54bd77c0
commit a60cbcdfe6
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/CodeGen/CGBlocks.cpp
View File

@@ -444,13 +444,15 @@ RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr* E) {
// Load the function.
llvm::Value *Func = Builder.CreateLoad(FuncPtr, false, "tmp");
const CGFunctionInfo &FnInfo = CGM.getTypes().getFunctionInfo(BPT);
bool IsVariadic =
BPT->getPointeeType()->getAsFunctionProtoType()->isVariadic();
QualType FnType = BPT->getPointeeType();
QualType ResultType = FnType->getAsFunctionType()->getResultType();
const CGFunctionInfo &FnInfo =
CGM.getTypes().getFunctionInfo(ResultType, Args);
// Cast the function pointer to the right type.
const llvm::Type *BlockFTy =
CGM.getTypes().GetFunctionType(FnInfo, IsVariadic);
CGM.getTypes().GetFunctionType(FnInfo, false);
const llvm::Type *BlockFTyPtr = llvm::PointerType::getUnqual(BlockFTy);
Func = Builder.CreateBitCast(Func, BlockFTyPtr);