diff options
| -rw-r--r-- | lib/Sema/SemaExprObjC.cpp | 6 | ||||
| -rw-r--r-- | test/SemaObjC/weak-receiver-warn.m | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp index 598ad0b27a..a3fe7d3bbe 100644 --- a/lib/Sema/SemaExprObjC.cpp +++ b/lib/Sema/SemaExprObjC.cpp @@ -1379,10 +1379,12 @@ static void DiagnoseARCUseOfWeakReceiver(Sema &S, Expr *Receiver) { ObjCMethodDecl *Method = ME->getMethodDecl(); if (Method && Method->isSynthesized()) { Selector Sel = Method->getSelector(); - if (Sel.getNumArgs() == 0) + if (Sel.getNumArgs() == 0) { + const DeclContext *Container = Method->getDeclContext(); PDecl = - S.LookupPropertyDecl(Method->getClassInterface(), + S.LookupPropertyDecl(cast<ObjCContainerDecl>(Container), Sel.getIdentifierInfoForSlot(0)); + } if (PDecl) T = PDecl->getType(); } diff --git a/test/SemaObjC/weak-receiver-warn.m b/test/SemaObjC/weak-receiver-warn.m index 56d9bc10f9..e6f8eaba8c 100644 --- a/test/SemaObjC/weak-receiver-warn.m +++ b/test/SemaObjC/weak-receiver-warn.m @@ -66,3 +66,15 @@ void test0(Test0 *x) { } @end + + +// Weak properties on protocols can be synthesized by an adopting class. +@protocol MyProtocol +@property (weak) id object; // expected-note 2 {{property declared here}} +@end + +void testProtocol(id <MyProtocol> input) { + [[input object] Meth]; // expected-warning {{weak property may be unpredictably null in ARC mode}} + [input.object Meth]; // expected-warning {{weak property may be unpredictably null in ARC mode}} +} + |