diff options
| author | John McCall <rjmccall@apple.com> | 2013-05-03 07:33:41 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2013-05-03 07:33:41 +0000 |
| commit | dec348f7dbf8207a30a2a7b978f6568e2a499cbd (patch) | |
| tree | 3cd321d2f0ecf328ba36812a25554a7e0502baa7 /clang/lib/Sema/SemaExprObjC.cpp | |
| parent | 320fbf057c7bcdfd45b90747a9acf93cde93ec38 (diff) | |
| download | bcm5719-llvm-dec348f7dbf8207a30a2a7b978f6568e2a499cbd.tar.gz bcm5719-llvm-dec348f7dbf8207a30a2a7b978f6568e2a499cbd.zip | |
Correctly emit certain implicit references to 'self' even within
a lambda.
Bug #1 is that CGF's CurFuncDecl was "stuck" at lambda invocation
functions. Fix that by generally improving getNonClosureContext
to look through lambdas and captured statements but only report
code contexts, which is generally what's wanted. Audit uses of
CurFuncDecl and getNonClosureAncestor for correctness.
Bug #2 is that lambdas weren't specially mapping 'self' when inside
an ObjC method. Fix that by removing the requirement for that
and using the normal EmitDeclRefLValue path in LoadObjCSelf.
rdar://13800041
llvm-svn: 181000
Diffstat (limited to 'clang/lib/Sema/SemaExprObjC.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprObjC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp index fed86eed517..53dc3d8885a 100644 --- a/clang/lib/Sema/SemaExprObjC.cpp +++ b/clang/lib/Sema/SemaExprObjC.cpp @@ -1334,7 +1334,7 @@ bool Sema::CheckMessageArgumentTypes(QualType ReceiverType, bool Sema::isSelfExpr(Expr *receiver) { // 'self' is objc 'self' in an objc method only. ObjCMethodDecl *method = - dyn_cast<ObjCMethodDecl>(CurContext->getNonClosureAncestor()); + dyn_cast_or_null<ObjCMethodDecl>(CurContext->getNonClosureAncestor()); if (!method) return false; receiver = receiver->IgnoreParenLValueCasts(); |
