maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

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
Show Stats 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);

13
clang/lib/CodeGen/CGCall.cpp
View File

@ -53,19 +53,6 @@ CGFunctionInfo &CodeGenTypes::getFunctionInfo(const FunctionProtoType *FTP) {
return getFunctionInfo(FTP->getResultType(), ArgTys);
}
const
CGFunctionInfo &CodeGenTypes::getFunctionInfo(const BlockPointerType *BPT) {
llvm::SmallVector<QualType, 16> ArgTys;
const FunctionProtoType *FTP =
BPT->getPointeeType()->getAsFunctionProtoType();
// Add the block pointer.
ArgTys.push_back(Context.getPointerType(Context.VoidTy));
for (unsigned i = 0, e = FTP->getNumArgs(); i != e; ++i)
ArgTys.push_back(FTP->getArgType(i));
return getFunctionInfo(FTP->getResultType(), ArgTys);
}
const CGFunctionInfo &CodeGenTypes::getFunctionInfo(const CXXMethodDecl *MD) {
llvm::SmallVector<QualType, 16> ArgTys;
// Add the 'this' pointer.

2
clang/lib/CodeGen/CodeGenTypes.h
View File

@ -172,11 +172,9 @@ public:
const CGFunctionInfo &getFunctionInfo(const FunctionNoProtoType *FTNP);
const CGFunctionInfo &getFunctionInfo(const FunctionProtoType *FTP);
const CGFunctionInfo &getFunctionInfo(const BlockPointerType *BPT);
const CGFunctionInfo &getFunctionInfo(const FunctionDecl *FD);
const CGFunctionInfo &getFunctionInfo(const CXXMethodDecl *MD);
const CGFunctionInfo &getFunctionInfo(const ObjCMethodDecl *MD);
//private:
const CGFunctionInfo &getFunctionInfo(QualType ResTy,
const CallArgList &Args);
public:

5
clang/test/CodeGen/blocks.c
View File

@ -1,2 +1,7 @@
// RUN: clang-cc %s -emit-llvm -o %t -fblocks
void (^f)(void) = ^{};
// rdar://6768379
int f0(int (^a0)()) {
return a0(1, 2, 3);
}