diff options
| -rw-r--r-- | lib/CodeGen/CGBlocks.cpp | 21 | ||||
| -rw-r--r-- | test/CodeGen/kr-style-block.c | 12 |
2 files changed, 28 insertions, 5 deletions
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index 4e9419ed20..d705af1b33 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -623,8 +623,19 @@ CodeGenFunction::GenerateBlockFunction(const BlockExpr *BExpr, .getTypeStoreSizeInBits(CGM.getGenericExtendedBlockLiteralType()) / 8; BlockAlign = getContext().getTypeAlign(getContext().VoidPtrTy) / 8; - const FunctionProtoType *FTy = - cast<FunctionProtoType>(BExpr->getFunctionType()); + const FunctionType *BlockFunctionType = BExpr->getFunctionType(); + QualType ResultType; + bool IsVariadic; + if (!isa<FunctionNoProtoType>(BlockFunctionType)) { + const FunctionProtoType *FTy = cast<FunctionProtoType>(BlockFunctionType); + ResultType = FTy->getResultType(); + IsVariadic = FTy->isVariadic(); + } + else { + // K&R style block. + ResultType = BlockFunctionType->getResultType(); + IsVariadic = false; + } FunctionArgList Args; @@ -644,18 +655,18 @@ CodeGenFunction::GenerateBlockFunction(const BlockExpr *BExpr, Args.push_back(std::make_pair(*i, (*i)->getType())); const CGFunctionInfo &FI = - CGM.getTypes().getFunctionInfo(FTy->getResultType(), Args); + CGM.getTypes().getFunctionInfo(ResultType, Args); std::string Name = std::string("__") + Info.Name + "_block_invoke_"; CodeGenTypes &Types = CGM.getTypes(); - const llvm::FunctionType *LTy = Types.GetFunctionType(FI, FTy->isVariadic()); + const llvm::FunctionType *LTy = Types.GetFunctionType(FI, IsVariadic); llvm::Function *Fn = llvm::Function::Create(LTy, llvm::GlobalValue::InternalLinkage, Name, &CGM.getModule()); - StartFunction(BD, FTy->getResultType(), Fn, Args, + StartFunction(BD, ResultType, Fn, Args, BExpr->getBody()->getLocEnd()); CurFuncDecl = OuterFuncDecl; EmitStmt(BExpr->getBody()); diff --git a/test/CodeGen/kr-style-block.c b/test/CodeGen/kr-style-block.c new file mode 100644 index 0000000000..ccaa2c5144 --- /dev/null +++ b/test/CodeGen/kr-style-block.c @@ -0,0 +1,12 @@ +// RUN: clang-cc -emit-llvm %s -o %t + +void foo (void(^)()); + +int main() +{ +foo( + ^() + { + } +); +} |