Vendor import of clang trunk r161861:

http://llvm.org/svn/llvm-project/cfe/trunk@161861

1 files changed, 52 insertions, 0 deletions

diff --git a/test/SemaObjC/property-user-setter.m b/test/SemaObjC/property-user-setter.m
index 7d4e544..9ebad60 100644
--- a/test/SemaObjC/property-user-setter.m
+++ b/test/SemaObjC/property-user-setter.m
@@ -102,3 +102,55 @@ int main (void) {
       abort ();
     return 0;
 }
+
+// rdar://11363363
+@interface rdar11363363
+{
+  id R;
+}
+@property (copy) id p;
+@property (copy) id r;
+@property (copy) id Q;
+@property (copy) id t; // expected-note 2 {{property declared here}}
+@property (copy) id T; // expected-note 2 {{property declared here}}
+@property (copy) id Pxyz; // expected-note 2 {{property declared here}}
+@property (copy) id pxyz; // expected-note 2 {{property declared here}}
+@end
+
+@implementation rdar11363363
+@synthesize p;
+@synthesize r;
+@synthesize Q;
+@synthesize t, T;
+@synthesize Pxyz, pxyz;
+- (id) Meth {
+  self.P = 0;
+  self.q = 0;
+// rdar://11528439
+  self.t = 0; // expected-error {{synthesized properties 't' and 'T' both claim setter 'setT:'}}
+  self.T = 0; // expected-error {{synthesized properties 'T' and 't' both claim setter 'setT:'}}
+  self.Pxyz = 0; // expected-error {{synthesized properties 'Pxyz' and 'pxyz' both claim setter 'setPxyz:'}}
+  self.pxyz = 0; // expected-error {{synthesized properties 'pxyz' and 'Pxyz' both claim setter 'setPxyz:'}}
+  self.R = 0;
+  return self.R; // expected-error {{expected getter method not found on object of type 'rdar11363363 *'}}
+}
+@end
+
+// rdar://11499742
+@class BridgeFormatter;
+
+@interface FMXBridgeFormatter 
+
+@property(assign, readwrite, getter=formatter, setter=setFormatter:) BridgeFormatter* cppFormatter;
+
+@end
+
+@implementation FMXBridgeFormatter
+@synthesize cppFormatter;
+
+- (void) dealloc
+{
+ self.formatter = 0;
+}
+@end
+