objc: tweak my last patch to warn if class extension
has not overridden the property. // rdar://11656982
llvm-svn: 158871
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp
index 32fbb04..13350ea 100644
--- a/clang/lib/Sema/SemaObjCProperty.cpp
+++ b/clang/lib/Sema/SemaObjCProperty.cpp
@@ -612,7 +612,6 @@
bool warn = (Attributes & ObjCDeclSpec::DQ_PR_readonly);
for (const ObjCCategoryDecl *CDecl = ClassDecl->getFirstClassExtension();
CDecl; CDecl = CDecl->getNextClassExtension()) {
- warn = false;
ObjCPropertyDecl *ClassExtProperty = 0;
for (ObjCContainerDecl::prop_iterator P = CDecl->prop_begin(),
E = CDecl->prop_end(); P != E; ++P) {
@@ -622,6 +621,7 @@
}
}
if (ClassExtProperty) {
+ warn = false;
unsigned classExtPropertyAttr =
ClassExtProperty->getPropertyAttributesAsWritten();
// We are issuing the warning that we postponed because class extensions
diff --git a/clang/test/SemaObjC/tentative-property-decl.m b/clang/test/SemaObjC/tentative-property-decl.m
index 4ab2f56..f69ac6d 100644
--- a/clang/test/SemaObjC/tentative-property-decl.m
+++ b/clang/test/SemaObjC/tentative-property-decl.m
@@ -15,6 +15,7 @@
@interface MyClass : Super
@property(nonatomic, copy, readonly) NSString *prop;
+@property(nonatomic, copy, readonly) id warnProp; // expected-warning {{property attributes 'readonly' and 'copy' are mutually exclusive}}
@end
@interface MyClass ()
@@ -23,11 +24,13 @@
@implementation MyClass
@synthesize prop;
+@synthesize warnProp;
@end
@protocol P
@property(nonatomic, copy, readonly) NSString *prop;
+@property(nonatomic, copy, readonly) id warnProp; // expected-warning {{property attributes 'readonly' and 'copy' are mutually exclusive}}
@end
@interface YourClass : Super <P>
@@ -39,5 +42,6 @@
@implementation YourClass
@synthesize prop;
+@synthesize warnProp;
@end