summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaExprObjC.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2011-03-28 16:23:34 +0000
committerFariborz Jahanian <fjahanian@apple.com>2011-03-28 16:23:34 +0000
commitd0d31bf2633e2b3855445dcccdd49a6b6875c7fc (patch)
treeb1229b97207f334c156aab96619b1797e9803ddb /clang/lib/Sema/SemaExprObjC.cpp
parent87c19f61d4be84716158e0e56ca7b3fe7ddd3329 (diff)
downloadbcm5719-llvm-d0d31bf2633e2b3855445dcccdd49a6b6875c7fc.tar.gz
bcm5719-llvm-d0d31bf2633e2b3855445dcccdd49a6b6875c7fc.zip
Also 'self' in blocks need be handled specially.
// rdar://9181463 llvm-svn: 128410
Diffstat (limited to 'clang/lib/Sema/SemaExprObjC.cpp')
-rw-r--r--clang/lib/Sema/SemaExprObjC.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp
index 22a1b19921b..cf38225de0c 100644
--- a/clang/lib/Sema/SemaExprObjC.cpp
+++ b/clang/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)
OpenPOWER on IntegriCloud