[cfe-commits] r155159 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td include/clang/Sema/Sema.h lib/Sema/SemaExprObjC.cpp lib/Sema/SemaPseudoObject.cpp test/SemaObjC/weak-receiver-warn.m
Fariborz Jahanian
fjahanian at apple.com
Thu Apr 19 14:44:57 PDT 2012
Author: fjahanian
Date: Thu Apr 19 16:44:57 2012
New Revision: 155159
URL: http://llvm.org/viewvc/llvm-project?rev=155159&view=rev
Log:
objective-c arc: Issue warning under -Wreceiver-is-weak
if receiver is a 'weak' property, by type or by attribute.
// rdar://10225276
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/include/clang/Sema/Sema.h
cfe/trunk/lib/Sema/SemaExprObjC.cpp
cfe/trunk/lib/Sema/SemaPseudoObject.cpp
cfe/trunk/test/SemaObjC/weak-receiver-warn.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=155159&r1=155158&r2=155159&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Thu Apr 19 16:44:57 2012
@@ -660,7 +660,8 @@
def err_gc_weak_property_strong_type : Error<
"weak attribute declared on a __strong type property in GC mode">;
def warn_receiver_is_weak : Warning <
- "weak receiver may be unpredictably null in ARC mode">,
+ "weak %select{receiver|property|implicit property}0 may be "
+ "unpredictably null in ARC mode">,
InGroup<DiagGroup<"receiver-is-weak">>, DefaultIgnore;
def error_synthesized_ivar_yet_not_supported : Error<
Modified: cfe/trunk/include/clang/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=155159&r1=155158&r2=155159&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/Sema.h (original)
+++ cfe/trunk/include/clang/Sema/Sema.h Thu Apr 19 16:44:57 2012
@@ -5901,6 +5901,9 @@
bool IsInstance);
bool inferObjCARCLifetime(ValueDecl *decl);
+
+ void DiagnoseARCUseOfWeakReceiver(NamedDecl *PDecl,
+ QualType T, SourceLocation Loc);
ExprResult
HandleExprPropertyRefExpr(const ObjCObjectPointerType *OPT,
Modified: cfe/trunk/lib/Sema/SemaExprObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprObjC.cpp?rev=155159&r1=155158&r2=155159&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprObjC.cpp Thu Apr 19 16:44:57 2012
@@ -1323,6 +1323,32 @@
return 0;
}
+void
+Sema::DiagnoseARCUseOfWeakReceiver(NamedDecl *PDecl,
+ QualType T, SourceLocation Loc) {
+ if (!getLangOpts().ObjCAutoRefCount)
+ return;
+
+ if (T.getObjCLifetime() == Qualifiers::OCL_Weak) {
+ Diag(Loc, diag::warn_receiver_is_weak)
+ << (!PDecl ? 0 : (isa<ObjCPropertyDecl>(PDecl) ? 1 : 2));
+ if (PDecl) {
+ if (isa<ObjCPropertyDecl>(PDecl))
+ Diag(PDecl->getLocation(), diag::note_property_declare);
+ else
+ Diag(PDecl->getLocation(), diag::note_method_declared_at) << PDecl;
+ }
+ return;
+ }
+
+ if (PDecl)
+ if (ObjCPropertyDecl *Prop = dyn_cast<ObjCPropertyDecl>(PDecl))
+ if (Prop->getPropertyAttributes() & ObjCPropertyDecl::OBJC_PR_weak) {
+ Diag(Loc, diag::warn_receiver_is_weak) << 1;
+ Diag(Prop->getLocation(), diag::note_property_declare);
+ }
+}
+
/// HandleExprPropertyRefExpr - Handle foo.bar where foo is a pointer to an
/// objective C interface. This is a property reference expression.
ExprResult Sema::
@@ -1354,7 +1380,6 @@
// Check whether we can reference this property.
if (DiagnoseUseOfDecl(PD, MemberLoc))
return ExprError();
-
if (Super)
return Owned(new (Context) ObjCPropertyRefExpr(PD, Context.PseudoObjectTy,
VK_LValue, OK_ObjCProperty,
@@ -1372,7 +1397,7 @@
// Check whether we can reference this property.
if (DiagnoseUseOfDecl(PD, MemberLoc))
return ExprError();
-
+
if (Super)
return Owned(new (Context) ObjCPropertyRefExpr(PD,
Context.PseudoObjectTy,
@@ -2379,10 +2404,10 @@
}
if (getLangOpts().ObjCAutoRefCount) {
- if (Receiver &&
- (Receiver->IgnoreParenImpCasts()->getType().getObjCLifetime()
- == Qualifiers::OCL_Weak))
- Diag(Receiver->getLocStart(), diag::warn_receiver_is_weak);
+ if (Receiver)
+ DiagnoseARCUseOfWeakReceiver(0 /* PDecl */,
+ Receiver->IgnoreParenImpCasts()->getType(),
+ Receiver->getLocStart());
// In ARC, annotate delegate init calls.
if (Result->getMethodFamily() == OMF_init &&
Modified: cfe/trunk/lib/Sema/SemaPseudoObject.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaPseudoObject.cpp?rev=155159&r1=155158&r2=155159&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaPseudoObject.cpp (original)
+++ cfe/trunk/lib/Sema/SemaPseudoObject.cpp Thu Apr 19 16:44:57 2012
@@ -478,6 +478,8 @@
if (RefExpr->isImplicitProperty()) {
if ((Getter = RefExpr->getImplicitPropertyGetter())) {
GetterSelector = Getter->getSelector();
+ S.DiagnoseARCUseOfWeakReceiver(Getter, Getter->getResultType(),
+ RefExpr->getLocation());
return true;
}
else {
@@ -497,6 +499,8 @@
}
ObjCPropertyDecl *prop = RefExpr->getExplicitProperty();
+ S.DiagnoseARCUseOfWeakReceiver(prop, prop->getType(),
+ RefExpr->getLocation());
Getter = LookupMethodInReceiverType(S, prop->getGetterName(), RefExpr);
return (Getter != 0);
}
Modified: cfe/trunk/test/SemaObjC/weak-receiver-warn.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/weak-receiver-warn.m?rev=155159&r1=155158&r2=155159&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/weak-receiver-warn.m (original)
+++ cfe/trunk/test/SemaObjC/weak-receiver-warn.m Thu Apr 19 16:44:57 2012
@@ -17,3 +17,34 @@
[weakx setBlock: ^{ [x actNow]; }]; // expected-warning {{weak receiver may be unpredictably null in ARC mode}}
weakx.block = ^{ [x actNow]; };
}
+
+ at interface Test
+{
+ __weak Test* weak_prop;
+}
+- (void) Meth;
+ at property __weak Test* weak_prop; // expected-note 2 {{property declared here}}
+ at property (weak, atomic) id weak_atomic_prop; // expected-note 2 {{property declared here}}
+- (__weak id) P; // expected-note 2 {{method 'P' declared here}}
+ at end
+
+ at implementation Test
+- (void) Meth {
+ if (self.weak_prop) { // expected-warning {{weak property may be unpredictably null in ARC mode}}
+ self.weak_prop = 0;
+ }
+ if (self.weak_atomic_prop) { // expected-warning {{weak property may be unpredictably null in ARC mode}}
+ self.weak_atomic_prop = 0;
+ }
+ [self.weak_prop Meth]; // expected-warning {{weak property may be unpredictably null in ARC mode}}
+ id pi = self.P; // expected-warning {{weak implicit property may be unpredictably null in ARC mode}}
+
+ [self.weak_atomic_prop Meth]; // expected-warning {{weak property may be unpredictably null in ARC mode}}
+
+ [self.P Meth]; // expected-warning {{weak implicit property may be unpredictably null in ARC mode}}
+}
+
+- (__weak id) P { return 0; }
+ at dynamic weak_prop, weak_atomic_prop;
+ at end
+
More information about the cfe-commits
mailing list