[arcmt] In ARC default for properties is 'strong' so just remove a 'retain' if possible,

instead of changing it to 'strong'. rdar://9984862.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142304 91177308-0d34-0410-b5e6-96231b3b80d8

7 files changed, 24 insertions, 12 deletions

diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m b/test/ARCMT/assign-prop-with-arc-runtime.m
index 9e10b58f62..4f50aac8eb 100644
--- a/test/ARCMT/assign-prop-with-arc-runtime.m
+++ b/test/ARCMT/assign-prop-with-arc-runtime.m
@@ -36,12 +36,18 @@ typedef _NSCachedAttributedString *BadClassForWeak;
 
 @property (assign) Foo *no_user_ivar1;
 @property (readonly) Foo *no_user_ivar2;
+
+@property (retain) id def1;
+@property (atomic,retain) id def2;
+@property (retain,atomic) id def3;
+
 @end
 
 @implementation Foo
 @synthesize x,w,q1,q2,oo,bcw,not_safe1,not_safe2,not_safe3;
 @synthesize no_user_ivar1, no_user_ivar2;
 @synthesize assign_plus1, assign_plus2, assign_plus3;
+@synthesize def1, def2, def3;
 
 -(void)test:(Foo *)parm {
   assign_plus1 = [[Foo alloc] init];
diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m.result b/test/ARCMT/assign-prop-with-arc-runtime.m.result
index 8a3a0f78b6..796af230b4 100644
--- a/test/ARCMT/assign-prop-with-arc-runtime.m.result
+++ b/test/ARCMT/assign-prop-with-arc-runtime.m.result
@@ -36,12 +36,18 @@ typedef _NSCachedAttributedString *BadClassForWeak;
 
 @property (weak) Foo *no_user_ivar1;
 @property (weak, readonly) Foo *no_user_ivar2;
+
+@property  id def1;
+@property (atomic) id def2;
+@property (atomic) id def3;
+
 @end
 
 @implementation Foo
 @synthesize x,w,q1,q2,oo,bcw,not_safe1,not_safe2,not_safe3;
 @synthesize no_user_ivar1, no_user_ivar2;
 @synthesize assign_plus1, assign_plus2, assign_plus3;
+@synthesize def1, def2, def3;
 
 -(void)test:(Foo *)parm {
   assign_plus1 = [[Foo alloc] init];
diff --git a/test/ARCMT/releases-driver.m.result b/test/ARCMT/releases-driver.m.result
index 70c0aecaf4..14aecce8e9 100644
--- a/test/ARCMT/releases-driver.m.result
+++ b/test/ARCMT/releases-driver.m.result
@@ -20,7 +20,7 @@ id IhaveSideEffect();
 @interface Foo : NSObject {
   id bar;
 }
-@property (strong) id bar;
+@property  id bar;
 -(void)test:(id)obj;
 @end
 
diff --git a/test/ARCMT/releases.m.result b/test/ARCMT/releases.m.result
index 556610ab2a..2b6240b10e 100644
--- a/test/ARCMT/releases.m.result
+++ b/test/ARCMT/releases.m.result
@@ -20,7 +20,7 @@ id IhaveSideEffect();
 @interface Foo : NSObject {
   id bar;
 }
-@property (strong) id bar;
+@property  id bar;
 -(void)test:(id)obj;
 @end
 
diff --git a/test/ARCMT/remove-dealloc-method.m.result b/test/ARCMT/remove-dealloc-method.m.result
index 47e31f9d24..5e1efa8687 100644
--- a/test/ARCMT/remove-dealloc-method.m.result
+++ b/test/ARCMT/remove-dealloc-method.m.result
@@ -5,10 +5,10 @@
 #define nil ((void*) 0)
 
 @interface Foo 
-@property (strong) id x;
-@property (strong) id y;
-@property (strong) id w;
-@property (strong) id z;
+@property  id x;
+@property  id y;
+@property  id w;
+@property  id z;
 @end
 
 @implementation Foo 
diff --git a/test/ARCMT/remove-dealloc-zerouts.m.result b/test/ARCMT/remove-dealloc-zerouts.m.result
index 9ae831abac..c857760bc3 100644
--- a/test/ARCMT/remove-dealloc-zerouts.m.result
+++ b/test/ARCMT/remove-dealloc-zerouts.m.result
@@ -3,10 +3,10 @@
 // RUN: diff %t %s.result
 
 @interface Foo 
-@property (strong) id x;
-@property (strong) id y;
-@property (strong) id w;
-@property (strong) id z;
+@property  id x;
+@property  id y;
+@property  id w;
+@property  id z;
 @property (strong) id q;
 @end
 
@@ -23,7 +23,7 @@
 @end
 
 @interface Bar
-@property (strong) Foo *a;
+@property  Foo *a;
 - (void) setA:(Foo*) val;
 - (id) a;
 @end
diff --git a/test/ARCMT/retains.m.result b/test/ARCMT/retains.m.result
index 2011e50636..19f8972942 100644
--- a/test/ARCMT/retains.m.result
+++ b/test/ARCMT/retains.m.result
@@ -9,7 +9,7 @@ id IhaveSideEffect();
 @interface Foo : NSObject {
   id bar;
 }
-@property (strong) id bar;
+@property  id bar;
 -(id)test:(id)obj;
 -(id)something;
 @end