diff options
| -rw-r--r-- | lib/CodeGen/CGBlocks.cpp | 13 | ||||
| -rw-r--r-- | test/CodeGen/func-in-block.c | 18 |
2 files changed, 30 insertions, 1 deletions
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index d5fc993c79..5743aa0d71 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -840,11 +840,22 @@ CodeGenFunction::GenerateBlockFunction(GlobalDecl GD, const BlockExpr *BExpr, CGM.SetInternalFunctionAttributes(BD, Fn, FI); + QualType FnType(BlockFunctionType, 0); + bool HasPrototype = (dyn_cast<FunctionProtoType>(BlockFunctionType) != 0); + + IdentifierInfo *ID = &getContext().Idents.get(Name.getString()); + CurCodeDecl = FunctionDecl::Create(getContext(), + getContext().getTranslationUnitDecl(), + SourceLocation(), ID, FnType, + 0, + FunctionDecl::Static, + FunctionDecl::None, + false, HasPrototype); + StartFunction(BD, ResultType, Fn, Args, BExpr->getBody()->getLocEnd()); CurFuncDecl = OuterFuncDecl; - CurCodeDecl = BD; // If we have a C++ 'this' reference, go ahead and force it into // existence now. diff --git a/test/CodeGen/func-in-block.c b/test/CodeGen/func-in-block.c new file mode 100644 index 0000000000..27e0c09609 --- /dev/null +++ b/test/CodeGen/func-in-block.c @@ -0,0 +1,18 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fblocks -emit-llvm -o - %s | FileCheck %s +// rdar: // 7860965 + +extern void PRINTF(const char *); +extern void B(void (^)(void)); + +int main() +{ + PRINTF(__func__); + B( + ^{ + PRINTF(__func__); + } + ); + return 0; // not reached +} + +// CHECK: call void @PRINTF({{.*}}@__func__.__main_block_invoke_ |