summaryrefslogtreecommitdiffstats
path: root/test/ARCMT
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-01-21 00:43:53 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-01-21 00:43:53 +0000
commit2f72ec9fc4d3c127b5c77e13346eb640deae396a (patch)
tree1a38ff37fcd9e2f4c146343db7ba3500241b5f95 /test/ARCMT
parentc8dc1352071575c36401158094a865ad682fb886 (diff)
arg migrator: change all "assign" of object properties
to "strong" when migrating from GC. // rdar://10532449 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148607 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ARCMT')
-rw-r--r--test/ARCMT/GC-no-arc-runtime.m.result8
-rw-r--r--test/ARCMT/GC.m11
-rw-r--r--test/ARCMT/GC.m.result19
3 files changed, 30 insertions, 8 deletions
diff --git a/test/ARCMT/GC-no-arc-runtime.m.result b/test/ARCMT/GC-no-arc-runtime.m.result
index 983af62c4a..983a5b1742 100644
--- a/test/ARCMT/GC-no-arc-runtime.m.result
+++ b/test/ARCMT/GC-no-arc-runtime.m.result
@@ -52,12 +52,12 @@ __attribute__((objc_arc_weak_reference_unavailable))
@end
@interface I4Impl {
- I4Impl *pds2;
+ I4Impl *__strong pds2;
}
@property (unsafe_unretained) I4Impl * pw1, * pw2;
-@property I4Impl * ps;
-@property I4Impl * pds;
-@property I4Impl * pds2;
+@property (strong) I4Impl * ps;
+@property (strong) I4Impl * pds;
+@property (strong) I4Impl * pds2;
@end
@implementation I4Impl
diff --git a/test/ARCMT/GC.m b/test/ARCMT/GC.m
index d309dabf68..f241e43008 100644
--- a/test/ARCMT/GC.m
+++ b/test/ARCMT/GC.m
@@ -79,3 +79,14 @@ __attribute__((objc_arc_weak_reference_unavailable))
id x = NSMakeCollectable(cft);
}
@end
+
+// rdar://10532449
+@interface rdar10532449
+@property (assign) id assign_prop;
+@property (assign, readonly) id __strong strong_readonly_prop;
+@property (assign) id __weak weak_prop;
+@end
+
+@implementation rdar10532449
+@synthesize assign_prop, strong_readonly_prop, weak_prop;
+@end
diff --git a/test/ARCMT/GC.m.result b/test/ARCMT/GC.m.result
index 2cf6b8e244..f9e954af5a 100644
--- a/test/ARCMT/GC.m.result
+++ b/test/ARCMT/GC.m.result
@@ -52,15 +52,15 @@ __attribute__((objc_arc_weak_reference_unavailable))
@end
@interface I4Impl {
- I4Impl *pds2;
+ I4Impl *__strong pds2;
I4Impl *pds3;
__weak I4Impl *pw3;
__weak I4Impl *pw4;
}
@property (weak) I4Impl * pw1, * pw2;
-@property I4Impl * ps;
-@property I4Impl * pds;
-@property I4Impl * pds2;
+@property (strong) I4Impl * ps;
+@property (strong) I4Impl * pds;
+@property (strong) I4Impl * pds2;
@property (readwrite) I4Impl * pds3;
@property (readonly) I4Impl * pds4;
@property (weak, readonly) I4Impl *pw3;
@@ -74,3 +74,14 @@ __attribute__((objc_arc_weak_reference_unavailable))
id x = CFBridgingRelease(cft);
}
@end
+
+// rdar://10532449
+@interface rdar10532449
+@property (strong) id assign_prop;
+@property (strong, readonly) id strong_readonly_prop;
+@property (weak) id weak_prop;
+@end
+
+@implementation rdar10532449
+@synthesize assign_prop, strong_readonly_prop, weak_prop;
+@end