[cfe-commits] r144136 - in /cfe/trunk: lib/ARCMigrate/TransProperties.cpp test/ARCMT/GC.m test/ARCMT/GC.m.result test/ARCMT/assign-prop-with-arc-runtime.m.result

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Tue Nov  8 16:10:58 2011
New Revision: 144136

URL: http://llvm.org/viewvc/llvm-project?rev=144136&view=rev
Log:
[arcmt] Now that readonly properties are strong-by-default, do not add redundant 'strong'.

Modified:
    cfe/trunk/lib/ARCMigrate/TransProperties.cpp
    cfe/trunk/test/ARCMT/GC.m
    cfe/trunk/test/ARCMT/GC.m.result
    cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result

Modified: cfe/trunk/lib/ARCMigrate/TransProperties.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransProperties.cpp?rev=144136&r1=144135&r2=144136&view=diff
==============================================================================
--- cfe/trunk/lib/ARCMigrate/TransProperties.cpp (original)
+++ cfe/trunk/lib/ARCMigrate/TransProperties.cpp Tue Nov  8 16:10:58 2011
@@ -218,7 +218,7 @@
 
     if (HasIvarAssignedAPlusOneObject ||
         (Pass.isGCMigration() && !hasGCWeak(props, atLoc)))
-      return doPropAction(PropAction_MaybeAddStrong, props, atLoc);
+      return; // 'strong' by default.
 
     return doPropAction(PropAction_MaybeAddWeakOrUnsafe, props, atLoc);
   }

Modified: cfe/trunk/test/ARCMT/GC.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/GC.m?rev=144136&r1=144135&r2=144136&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/GC.m (original)
+++ cfe/trunk/test/ARCMT/GC.m Tue Nov  8 16:10:58 2011
@@ -64,10 +64,11 @@
 @property (assign) I4Impl * pds;
 @property (assign) I4Impl * pds2;
 @property (readwrite) I4Impl * pds3;
+ at property (readonly) I4Impl * pds4;
 @end
 
 @implementation I4Impl
- at synthesize pw1, pw2, ps, pds, pds2, pds3;
+ at synthesize pw1, pw2, ps, pds, pds2, pds3, pds4;
 
 -(void)test1:(CFTypeRef *)cft {
   id x = NSMakeCollectable(cft);

Modified: cfe/trunk/test/ARCMT/GC.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/GC.m.result?rev=144136&r1=144135&r2=144136&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/GC.m.result (original)
+++ cfe/trunk/test/ARCMT/GC.m.result Tue Nov  8 16:10:58 2011
@@ -59,10 +59,11 @@
 @property  I4Impl * pds;
 @property  I4Impl * pds2;
 @property (readwrite) I4Impl * pds3;
+ at property (readonly) I4Impl * pds4;
 @end
 
 @implementation I4Impl
- at synthesize pw1, pw2, ps, pds, pds2, pds3;
+ at synthesize pw1, pw2, ps, pds, pds2, pds3, pds4;
 
 -(void)test1:(CFTypeRef *)cft {
   id x = CFBridgingRelease(cft);

Modified: cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result?rev=144136&r1=144135&r2=144136&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result (original)
+++ cfe/trunk/test/ARCMT/assign-prop-with-arc-runtime.m.result Tue Nov  8 16:10:58 2011
@@ -32,8 +32,8 @@
 @property (unsafe_unretained) NSObject *not_safe2;
 @property (unsafe_unretained) Forw *not_safe3;
 @property (readonly) Foo *assign_plus1;
- at property (strong, readonly) Foo *assign_plus2;
- at property (strong, readonly) Foo *assign_plus3;
+ at property (readonly) Foo *assign_plus2;
+ at property (readonly) Foo *assign_plus3;
 
 @property (weak) Foo *no_user_ivar1;
 @property (weak, readonly) Foo *no_user_ivar2;