diff options
| -rw-r--r-- | lib/Sema/SemaExprObjC.cpp | 5 | ||||
| -rw-r--r-- | test/SemaObjC/self-in-function.m | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp index 22a1b19921..cf38225de0 100644 --- a/lib/Sema/SemaExprObjC.cpp +++ b/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) diff --git a/test/SemaObjC/self-in-function.m b/test/SemaObjC/self-in-function.m index 901cc31e47..9027a947a0 100644 --- a/test/SemaObjC/self-in-function.m +++ b/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) { |