diff options
Diffstat (limited to 'clang/test/SemaObjC')
| -rw-r--r-- | clang/test/SemaObjC/atomoic-property-synnthesis-rules.m | 24 | ||||
| -rw-r--r-- | clang/test/SemaObjC/property-3.m | 2 | ||||
| -rw-r--r-- | clang/test/SemaObjC/property-in-class-extension-1.m | 6 |
3 files changed, 18 insertions, 14 deletions
diff --git a/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m b/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m index b681558220d..c7fac7b6181 100644 --- a/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m +++ b/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m @@ -129,10 +129,8 @@ // read-only in class, read-write in class extension - might warn @property(readonly) int GetSet_ReadWriteInExt; -@property(readonly) int Get_ReadWriteInExt; // expected-note {{property declared here}} \ - // expected-note {{setter and getter must both be synthesized}} -@property(readonly) int Set_ReadWriteInExt; // expected-note {{property declared here}} \ - // expected-note {{setter and getter must both be synthesized}} +@property(readonly) int Get_ReadWriteInExt; +@property(readonly) int Set_ReadWriteInExt; @property(readonly) int None_ReadWriteInExt; @property(nonatomic,readonly) int GetSet_Nonatomic_ReadWriteInExt; @property(nonatomic,readonly) int Get_Nonatomic_ReadWriteInExt; @@ -162,10 +160,8 @@ @property(nonatomic,readonly) int None_Nonatomic_ReadOnly_LateSynthesize; @property(readonly) int GetSet_ReadWriteInExt_LateSynthesize; -@property(readonly) int Get_ReadWriteInExt_LateSynthesize; // expected-note {{property declared here}} \ - // expected-note {{setter and getter must both be synthesized}} -@property(readonly) int Set_ReadWriteInExt_LateSynthesize; // expected-note {{property declared here}} \ - // expected-note {{setter and getter must both be synthesized}} +@property(readonly) int Get_ReadWriteInExt_LateSynthesize; +@property(readonly) int Set_ReadWriteInExt_LateSynthesize; @property(readonly) int None_ReadWriteInExt_LateSynthesize; @property(nonatomic,readonly) int GetSet_Nonatomic_ReadWriteInExt_LateSynthesize; @property(nonatomic,readonly) int Get_Nonatomic_ReadWriteInExt_LateSynthesize; @@ -207,8 +203,10 @@ @interface Foo () @property(readwrite) int GetSet_ReadWriteInExt; -@property(readwrite) int Get_ReadWriteInExt; -@property(readwrite) int Set_ReadWriteInExt; +@property(readwrite) int Get_ReadWriteInExt; // expected-note {{property declared here}} \ + // expected-note {{setter and getter must both be synthesized}} +@property(readwrite) int Set_ReadWriteInExt; // expected-note {{property declared here}} \ + // expected-note {{setter and getter must both be synthesized}} @property(readwrite) int None_ReadWriteInExt; @property(nonatomic,readwrite) int GetSet_Nonatomic_ReadWriteInExt; @property(nonatomic,readwrite) int Get_Nonatomic_ReadWriteInExt; @@ -216,8 +214,10 @@ @property(nonatomic,readwrite) int None_Nonatomic_ReadWriteInExt; @property(readwrite) int GetSet_ReadWriteInExt_LateSynthesize; -@property(readwrite) int Get_ReadWriteInExt_LateSynthesize; -@property(readwrite) int Set_ReadWriteInExt_LateSynthesize; +@property(readwrite) int Get_ReadWriteInExt_LateSynthesize; // expected-note {{property declared here}} \ + // expected-note {{setter and getter must both be synthesized}} +@property(readwrite) int Set_ReadWriteInExt_LateSynthesize; // expected-note {{property declared here}} \ + // expected-note {{setter and getter must both be synthesized}} @property(readwrite) int None_ReadWriteInExt_LateSynthesize; @property(nonatomic,readwrite) int GetSet_Nonatomic_ReadWriteInExt_LateSynthesize; @property(nonatomic,readwrite) int Get_Nonatomic_ReadWriteInExt_LateSynthesize; diff --git a/clang/test/SemaObjC/property-3.m b/clang/test/SemaObjC/property-3.m index 3f82bcc3b7c..7c0ba579ee4 100644 --- a/clang/test/SemaObjC/property-3.m +++ b/clang/test/SemaObjC/property-3.m @@ -29,5 +29,5 @@ typedef signed char BOOL; @interface EKCalendar () <EKProtocolMutableCalendar> @property (nonatomic, assign) BOOL allowReminders; -@property (nonatomic, assign) BOOL allowNonatomicProperty; // expected-warning {{'atomic' attribute on property 'allowNonatomicProperty' does not match the property inherited from 'EKProtocolCalendar'}} +@property (nonatomic, assign) BOOL allowNonatomicProperty; // expected-warning {{'atomic' attribute on property 'allowNonatomicProperty' does not match the property inherited from EKProtocolCalendar}} @end diff --git a/clang/test/SemaObjC/property-in-class-extension-1.m b/clang/test/SemaObjC/property-in-class-extension-1.m index 6e9d476c18a..8f5907b54d3 100644 --- a/clang/test/SemaObjC/property-in-class-extension-1.m +++ b/clang/test/SemaObjC/property-in-class-extension-1.m @@ -10,7 +10,7 @@ @property (nonatomic, copy, readonly) NSString* matchingMemoryModel; -@property (nonatomic, retain, readonly) NSString* addingNoNewMemoryModel; +@property (atomic, retain, readonly) NSString* addingNoNewMemoryModel; @property (readonly) NSString* none; @property (readonly) NSString* none1; @@ -50,10 +50,14 @@ // rdar://12214070 @interface radar12214070 @property (nonatomic, atomic, readonly) float propertyName; // expected-error {{property attributes 'atomic' and 'nonatomic' are mutually exclusive}} + +@property (nonatomic, readonly) float propertyName2; // expected-note {{property declared here}} @end @interface radar12214070 () @property (atomic, nonatomic, readonly, readwrite) float propertyName; // expected-error {{property attributes 'readonly' and 'readwrite' are mutually exclusive}} \ // expected-error {{property attributes 'atomic' and 'nonatomic' are mutually exclusive}} + +@property (atomic, readwrite) float propertyName2; // expected-warning {{'atomic' attribute on property 'propertyName2' does not match the property inherited from radar12214070}} @end |
