diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-08-07 16:38:44 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-08-07 16:38:44 +0000 |
| commit | a7c9f883e609da7bdd1f11504fa12c2cc3b196b3 (patch) | |
| tree | 643d800797930caee00e337ed61be99624a30f87 | |
| parent | 59fba12d280b7e9d24a8718bc78d66944290c297 (diff) | |
| download | bcm5719-llvm-a7c9f883e609da7bdd1f11504fa12c2cc3b196b3.tar.gz bcm5719-llvm-a7c9f883e609da7bdd1f11504fa12c2cc3b196b3.zip | |
objective-c: Exclude -Wdirect-ivar-access for arc.
Allow direct ivar access in init and dealloc methods
in mrr. // rdar://650197
llvm-svn: 161426
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 8 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExprMember.cpp | 13 | ||||
| -rw-r--r-- | clang/test/SemaObjC/warn-direct-ivar-access.m | 5 |
3 files changed, 22 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index e8ba54d24fb..c62df00a875 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -1962,8 +1962,12 @@ Sema::LookupInObjCMethod(LookupResult &Lookup, Scope *S, MarkAnyDeclReferenced(Loc, IV); if (IV->getType()->isObjCObjectPointerType() && - getLangOpts().getGC() == LangOptions::NonGC) - Diag(Loc, diag::warn_direct_ivar_access) << IV->getDeclName(); + getLangOpts().getGC() == LangOptions::NonGC && + !getLangOpts().ObjCAutoRefCount) { + ObjCMethodFamily MF = CurMethod->getMethodFamily(); + if (MF != OMF_init && MF != OMF_dealloc && MF != OMF_finalize) + Diag(Loc, diag::warn_direct_ivar_access) << IV->getDeclName(); + } return Owned(new (Context) ObjCIvarRefExpr(IV, IV->getType(), Loc, SelfExpr.take(), true, true)); diff --git a/clang/lib/Sema/SemaExprMember.cpp b/clang/lib/Sema/SemaExprMember.cpp index 5a116b44964..a23155d85e1 100644 --- a/clang/lib/Sema/SemaExprMember.cpp +++ b/clang/lib/Sema/SemaExprMember.cpp @@ -1261,8 +1261,17 @@ Sema::LookupMemberExpr(LookupResult &R, ExprResult &BaseExpr, Diag(DE->getLocation(), diag::error_arc_weak_ivar_access); } if (IV->getType()->isObjCObjectPointerType() && - getLangOpts().getGC() == LangOptions::NonGC) - Diag(MemberLoc, diag::warn_direct_ivar_access) << IV->getDeclName(); + getLangOpts().getGC() == LangOptions::NonGC && + !getLangOpts().ObjCAutoRefCount) { + bool warn = true; + if (ObjCMethodDecl *MD = getCurMethodDecl()) { + ObjCMethodFamily MF = MD->getMethodFamily(); + warn = (MF != OMF_init && MF != OMF_dealloc && + MF != OMF_finalize); + } + if (warn) + Diag(MemberLoc, diag::warn_direct_ivar_access) << IV->getDeclName(); + } return Owned(new (Context) ObjCIvarRefExpr(IV, IV->getType(), MemberLoc, BaseExpr.take(), IsArrow)); diff --git a/clang/test/SemaObjC/warn-direct-ivar-access.m b/clang/test/SemaObjC/warn-direct-ivar-access.m index 6850db64a3c..dfddd823e38 100644 --- a/clang/test/SemaObjC/warn-direct-ivar-access.m +++ b/clang/test/SemaObjC/warn-direct-ivar-access.m @@ -20,6 +20,11 @@ __attribute__((objc_root_class)) @interface MyObject { // expected-warning {{instance variable '_isTickledPink' is being directly accessed}} } +- (id) init { + _myMaster=0; + return _myMaster; +} +- (void) dealloc { _myMaster = 0; } @end MyObject * foo () |
