r190635 - Fix regression from r190427.

[Eli Friedman]

Author: efriedma
Date: Thu Sep 12 17:36:24 2013
New Revision: 190635

URL: http://llvm.org/viewvc/llvm-project?rev=190635&view=rev
Log:
Fix regression from r190427.

<rdar://problem/14970968>

Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/test/SemaObjC/blocks.m

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=190635&r1=190634&r2=190635&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Sep 12 17:36:24 2013
@@ -10012,7 +10012,7 @@ ExprResult Sema::ActOnChooseExpr(SourceL
 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(),

Modified: cfe/trunk/test/SemaObjC/blocks.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/blocks.m?rev=190635&r1=190634&r2=190635&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/blocks.m (original)
+++ cfe/trunk/test/SemaObjC/blocks.m Thu Sep 12 17:36:24 2013
@@ -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(); }