commit b460210fe0dec08971edfe33c294323cf79cb894
author Fariborz Jahanian <fjahanian@apple.com> Mon Mar 28 16:23:34 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Mon Mar 28 16:23:34 2011 +0000
tree 945e7e4c3bca4c33f1df0719434b8363263d16bb
parent 7f3ad231bed2184694e407772689e8903068bdca

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

diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index 22a1b19..cf38225 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -325,7 +325,10 @@
 
 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)