Also 'self' in blocks need be handled specially.

// rdar://9181463


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

lib/Sema/SemaExprObjC.cpp

@@ -325,7 +325,10 @@ bool Sema::CheckMessageArgumentTypes(Expr **Args, unsigned NumArgs,
 
 bool Sema::isSelfExpr(Expr *RExpr) {
   // 'self' is objc 'self' in an objc method only.
-  if (!isa<ObjCMethodDecl>(CurContext))
+  DeclContext *DC = CurContext;
+  while (isa<BlockDecl>(DC))
+    DC = DC->getParent();
+  if (DC && !isa<ObjCMethodDecl>(DC))
     return false;
   if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(RExpr))
     if (ICE->getCastKind() == CK_LValueToRValue)

test/SemaObjC/self-in-function.m

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1  -fsyntax-only -verify %s
+// RUN: %clang_cc1  -fsyntax-only -fblocks -verify %s
 // rdar://9181463
 
 typedef struct objc_class *Class;
@@ -14,6 +14,9 @@ typedef struct objc_object {
 
 void foo(Class self) {
   [self alloc];
+  (^() {
+    [self alloc];
+   })();
 }
 
 void bar(Class self) {