1 files changed, 46 insertions, 0 deletions
diff --git a/gcc/testsuite/obj-c++.dg/property/at-property-18.mm b/gcc/testsuite/obj-c++.dg/property/at-property-18.mm
new file mode 100644
index 000000000..d31821098
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/property/at-property-18.mm
@@ -0,0 +1,46 @@
+/* Contributed by Nicola Pero <nicola.pero@meta-innovation.com>, November 2010.  */
+/* { dg-do compile } */
+
+#include <objc/objc.h>
+
+/* Test that if you have a property declared in a class and a
+   category, the attributes match.  This is almost the same as
+   at-property-16.m, but for a category.  It is a separate file
+   because it is difficult to test multiple messages for the same
+   line.  */
+
+@interface MyRootClass
+{
+  Class isa;
+}
+@property (assign) id a;
+@property (retain) id b;
+@property int c;
+@property (nonatomic) int d;
+@property int e;
+@property int f;
+@property int g;
+@property (readonly) int h;
+@property (readonly,getter=getMe) int i;
+@property (nonatomic) float j;
+@end
+@interface MyRootClass (Category)
+@property (retain) id a;         /* { dg-warning "assign semantics attributes of property .a. conflict with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 16 } */
+@property (assign) id b;         /* { dg-warning "assign semantics attributes of property .b. conflict with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 17 } */
+@property (nonatomic) int c;     /* { dg-warning ".nonatomic. attribute of property .c. conflicts with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 18 } */
+@property int d;                 /* { dg-warning ".nonatomic. attribute of property .d. conflicts with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 19 } */
+@property (setter=setX:) int e;  /* { dg-warning ".setter. attribute of property .e. conflicts with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 20 } */
+@property (getter=x) int f;      /* { dg-warning ".getter. attribute of property .f. conflicts with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 21 } */
+@property (readonly) int g;      /* { dg-warning ".readonly. attribute of property .g. conflicts with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 22 } */
+@property (readwrite) int h;     /* Ok */
+@property (readonly) int i;      /* { dg-warning ".getter. attribute of property .i. conflicts with previous declaration" } */
+                                 /* { dg-message "originally specified here" "" { target *-*-* } 24 } */
+@property (nonatomic) float j;   /* Ok */
+@end