diff options
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/blocks.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 906a1e2cd6..3ca625cc72 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -753,7 +753,7 @@ LValue CodeGenFunction::EmitPredefinedFunctionName(unsigned Type) { } std::string FunctionName; - if(const FunctionDecl *FD = dyn_cast<FunctionDecl>(CurFuncDecl)) { + if (const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(CurFuncDecl)) { FunctionName = CGM.getMangledName(FD); } else { // Just get the mangled name; skipping the asm prefix if it diff --git a/test/CodeGen/blocks.c b/test/CodeGen/blocks.c index 4203fce051..c7fe3a91d2 100644 --- a/test/CodeGen/blocks.c +++ b/test/CodeGen/blocks.c @@ -17,4 +17,10 @@ struct s0 f2(struct s0 a0) { return ^(struct s0 a1){ return a1; }(a0); } +// This should not crash: rdar://6808051 +void *P = ^{ + void *Q = __func__; +}; + + // RUN: true |