objective-C: Change rules for overriding properties in

class extensions a little. clang now allows readonly property 
with no ownership rule (assign, unsafe_unretained, weak, retain, 
strong, or copy) with a readwrite property with an ownership rule.
// rdar://12103400 

llvm-svn: 162319

1 files changed, 2 insertions, 2 deletions

diff --git a/clang/test/SemaObjC/continuation-class-err.m b/clang/test/SemaObjC/continuation-class-err.m
index ceb8ee90c9f..8378c3f9f8b 100644
--- a/clang/test/SemaObjC/continuation-class-err.m
+++ b/clang/test/SemaObjC/continuation-class-err.m
@@ -5,13 +5,13 @@
   id _object;
   id _object1;
 }
-@property(readonly) id object;	// expected-note {{property declared here}}
+@property(readonly) id object;
 @property(readwrite, assign) id object1; // expected-note {{property declared here}}
 @property (readonly) int indentLevel;
 @end
 
 @interface ReadOnly ()
-@property(readwrite, copy) id object;	// expected-warning {{property attribute in class extension does not match the primary class}}
+@property(readwrite, copy) id object; // Ok. declaring memory model in class extension - primary has none.
 @property(readonly) id object1; // expected-error {{illegal redeclaration of property in class extension 'ReadOnly' (attribute must be 'readwrite', while its primary must be 'readonly')}}
 @property (readwrite, assign) int indentLevel; // OK. assign the default in any case.
 @end