Fix regression from r190427.

<rdar://problem/14970968>

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190635 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 918201c44cf45a785042cd2b020cbd283e411809..4e2e24eab48dc87418884ba0e10694cc7cdddb0c 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/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/test/SemaObjC/blocks.m b/test/SemaObjC/blocks.m
index 65434698a85fe93044d35a9ccc781bb1cf41e77d..d6681d051de1af4919d3571a01920dfe614d374c 100644 (file)
--- a/test/SemaObjC/blocks.m
+++ b/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(); }