diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2013-09-12 22:36:24 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2013-09-12 22:36:24 +0000 |
| commit | 4ef077a072f652df7d0664f65fefeb4cfd856dd3 (patch) | |
| tree | 59166e2739643297e0ac58f965b43aea9f4ce9f7 /clang | |
| parent | 1a6e77080fef6163c10f16d227b0eb1a982127ca (diff) | |
| download | bcm5719-llvm-4ef077a072f652df7d0664f65fefeb4cfd856dd3.tar.gz bcm5719-llvm-4ef077a072f652df7d0664f65fefeb4cfd856dd3.zip | |
Fix regression from r190427.
<rdar://problem/14970968>
llvm-svn: 190635
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | clang/test/SemaObjC/blocks.m | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 918201c44cf..4e2e24eab48 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -10012,7 +10012,7 @@ ExprResult Sema::ActOnChooseExpr(SourceLocation BuiltinLoc, void Sema::ActOnBlockStart(SourceLocation CaretLoc, Scope *CurScope) { BlockDecl *Block = BlockDecl::Create(Context, CurContext, CaretLoc); - { + if (LangOpts.CPlusPlus) { Decl *ManglingContextDecl; if (MangleNumberingContext *MCtx = getCurrentMangleNumberContext(Block->getDeclContext(), diff --git a/clang/test/SemaObjC/blocks.m b/clang/test/SemaObjC/blocks.m index 65434698a85..d6681d051de 100644 --- a/clang/test/SemaObjC/blocks.m +++ b/clang/test/SemaObjC/blocks.m @@ -216,3 +216,8 @@ void testAnonymousEnumTypes(int arg) { SB = ^{ if (arg) return TDFTE_Value; else return getTDFTE(); }; SB = ^{ if (arg) return getTDFTE(); else return TDFTE_Value; }; } + +static inline void inlinefunc() { + ^{}(); +} +void inlinefunccaller() { inlinefunc(); } |
