objective-c: reverse patch for // rdar://9818354

llvm-svn: 136658

9 files changed, 22 insertions, 24 deletions

diff --git a/clang/test/ARCMT/remove-dealloc-zerouts.m b/clang/test/ARCMT/remove-dealloc-zerouts.m
index 40e99206ffe..3ba85f1edca 100644
--- a/clang/test/ARCMT/remove-dealloc-zerouts.m
+++ b/clang/test/ARCMT/remove-dealloc-zerouts.m
@@ -34,11 +34,11 @@
 @end
 
 @implementation Bar
-@synthesize a;
 - (void) dealloc {
   [self setA:0];  // This is user-defined setter overriding synthesize, don't touch it.
   self.a.x = 0;  // every dealloc must zero out its own ivar. This patter is not recognized.
 }
+@synthesize a;
 - (void) setA:(Foo*) val { }
 - (id) a {return 0;}
 @end
diff --git a/clang/test/ARCMT/remove-dealloc-zerouts.m.result b/clang/test/ARCMT/remove-dealloc-zerouts.m.result
index 0487fdcd2e4..dc6ffd31149 100644
--- a/clang/test/ARCMT/remove-dealloc-zerouts.m.result
+++ b/clang/test/ARCMT/remove-dealloc-zerouts.m.result
@@ -29,11 +29,11 @@
 @end
 
 @implementation Bar
-@synthesize a;
 - (void) dealloc {
   [self setA:0];  // This is user-defined setter overriding synthesize, don't touch it.
   self.a.x = 0;  // every dealloc must zero out its own ivar. This patter is not recognized.
 }
+@synthesize a;
 - (void) setA:(Foo*) val { }
 - (id) a {return 0;}
 @end
diff --git a/clang/test/SemaObjC/arc.m b/clang/test/SemaObjC/arc.m
index 824fc08aec5..88d08181f60 100644
--- a/clang/test/SemaObjC/arc.m
+++ b/clang/test/SemaObjC/arc.m
@@ -614,9 +614,9 @@ int Test33(id someid) {
 @synthesize newName;
 
 @synthesize newName1;
-- (id) newName1 { return 0; } // expected-note {{method declared here}}
+- (id) newName1 { return 0; }
 
-@synthesize newName2; // expected-error {{property implementation declaration after method or function definition}}
+@synthesize newName2;
 @end
 
 void test35(void) {
diff --git a/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m b/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m
index 80c693d12f3..af790e3159a 100644
--- a/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m
+++ b/clang/test/SemaObjC/atomoic-property-synnthesis-rules.m
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1  -fsyntax-only -verify %s
-// XFAIL: *
 
 /*
   Conditions for warning:
diff --git a/clang/test/SemaObjC/conflict-nonfragile-abi2.m b/clang/test/SemaObjC/conflict-nonfragile-abi2.m
index a5051304ebc..5d6b2810fc1 100644
--- a/clang/test/SemaObjC/conflict-nonfragile-abi2.m
+++ b/clang/test/SemaObjC/conflict-nonfragile-abi2.m
@@ -15,13 +15,8 @@ int glob;
 // rdar://9027673
 // Warning on future name lookup rule is removed.
 @implementation I
-@synthesize glob;
-@dynamic p;
-@dynamic le;
-@dynamic l;
-@dynamic ls;
-@dynamic r;
 - (int) Meth { return glob; } // no warning
+@synthesize glob;
 // rdar://8248681
 - (int) Meth1: (int) p {
   extern int le;
@@ -31,6 +26,11 @@ int glob;
   p = le + ls + r;
   return l;
 }
+@dynamic p;
+@dynamic le;
+@dynamic l;
+@dynamic ls;
+@dynamic r;
 @end
 
 
diff --git a/clang/test/SemaObjC/default-synthesize.m b/clang/test/SemaObjC/default-synthesize.m
index 0f9b96aeaea..33e3bd6f346 100644
--- a/clang/test/SemaObjC/default-synthesize.m
+++ b/clang/test/SemaObjC/default-synthesize.m
@@ -111,7 +111,7 @@
 @end
 
 @implementation D
-@synthesize PROP=IVAR;
 - (int) Meth { return self.PROP; }
+@synthesize PROP=IVAR;
 @end
 
diff --git a/clang/test/SemaObjC/property-ns-returns-not-retained-attr.m b/clang/test/SemaObjC/property-ns-returns-not-retained-attr.m
index 4968f268ddf..187c93f3d3a 100644
--- a/clang/test/SemaObjC/property-ns-returns-not-retained-attr.m
+++ b/clang/test/SemaObjC/property-ns-returns-not-retained-attr.m
@@ -15,7 +15,7 @@
 @synthesize newName;
 
 @synthesize newName1;
-@synthesize newName2;
 - (id) newName1 { return 0; }
 
+@synthesize newName2;
 @end
diff --git a/clang/test/SemaObjC/provisional-ivar-lookup.m b/clang/test/SemaObjC/provisional-ivar-lookup.m
index df9092bf1ea..04d6a419309 100644
--- a/clang/test/SemaObjC/provisional-ivar-lookup.m
+++ b/clang/test/SemaObjC/provisional-ivar-lookup.m
@@ -15,7 +15,7 @@
 @synthesize foo = _foo;
 @synthesize foo1;
 
-- (void)setFoo:(int)value { // expected-note 3 {{method declared here}}
+- (void)setFoo:(int)value {
     _foo = foo; // expected-error {{use of undeclared identifier 'foo'}}
 }
 
@@ -31,10 +31,10 @@
     _foo = foo3;	// OK
 }
 
-@synthesize foo2 = _foo2; // expected-warning {{property implementation declaration after method or function definition}}
-@synthesize foo3; // expected-warning {{property implementation declaration after method or function definition}}
+@synthesize foo2 = _foo2;
+@synthesize foo3;
 
-@synthesize PROP=PROP; // expected-warning {{property implementation declaration after method or function definition}}
+@synthesize PROP=PROP;
 - (void)setPROP:(int)value {
     PROP = PROP;        // OK
 }
diff --git a/clang/test/SemaObjC/synth-provisional-ivars.m b/clang/test/SemaObjC/synth-provisional-ivars.m
index 1d44a0bfd2b..e8179aaa00d 100644
--- a/clang/test/SemaObjC/synth-provisional-ivars.m
+++ b/clang/test/SemaObjC/synth-provisional-ivars.m
@@ -18,23 +18,22 @@ int bar;
 @end
 
 @implementation I
-- (int) Meth { return PROP; } // expected-note 2{{'PROP' declared here}} \
-                              // expected-note 5{{method declared here}}
+- (int) Meth { return PROP; } // expected-note 2{{'PROP' declared here}}
 
-@dynamic PROP1; // expected-warning {{property implementation declaration after method or function definition}}
+@dynamic PROP1;
 - (int) Meth1 { return PROP1; }  // expected-error {{use of undeclared identifier 'PROP1'}}
 
 - (int) Meth2 { return PROP2; }  // expected-error {{use of undeclared identifier 'PROP2'}}
-@dynamic PROP2; // expected-warning {{property implementation declaration after method or function definition}}
+@dynamic PROP2;
 
 - (int) Meth3 { return PROP3; }  // expected-error {{use of undeclared identifier 'PROP3'}}
-@synthesize PROP3=IVAR; // expected-warning {{property implementation declaration after method or function definition}}
+@synthesize PROP3=IVAR;
 
 - (int) Meth4 { return PROP4; }
-@synthesize PROP4=PROP4; // expected-warning {{property implementation declaration after method or function definition}}
+@synthesize PROP4=PROP4;
 
 - (int) Meth5 { return bar; }  // expected-error {{use of undeclared identifier 'bar'}}
-@synthesize bar = _bar; // expected-warning {{property implementation declaration after method or function definition}}
+@synthesize bar = _bar;
 
 - (int) Meth6 { return bar1; }