diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 8 | ||||
| -rw-r--r-- | lib/Sema/SemaExprMember.cpp | 13 | ||||
| -rw-r--r-- | test/SemaObjC/warn-direct-ivar-access.m | 5 |
3 files changed, 22 insertions, 4 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index e8ba54d24f..c62df00a87 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/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/lib/Sema/SemaExprMember.cpp b/lib/Sema/SemaExprMember.cpp index 5a116b4496..a23155d85e 100644 --- a/lib/Sema/SemaExprMember.cpp +++ b/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/test/SemaObjC/warn-direct-ivar-access.m b/test/SemaObjC/warn-direct-ivar-access.m index 6850db64a3..dfddd823e3 100644 --- a/test/SemaObjC/warn-direct-ivar-access.m +++ b/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 () |