r192826 - ObjectiveC migrator. Use 'assign' for 'delegate'

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Oct 16 13:52:17 2013
New Revision: 192826

URL: http://llvm.org/viewvc/llvm-project?rev=192826&view=rev
Log:
ObjectiveC migrator. Use 'assign' for 'delegate'
properties. // rdar://15231860


Modified:
    cfe/trunk/lib/ARCMigrate/ObjCMT.cpp
    cfe/trunk/test/ARCMT/objcmt-arc-cf-annotations.m.result
    cfe/trunk/test/ARCMT/objcmt-atomic-property.m.result
    cfe/trunk/test/ARCMT/objcmt-property.m.result

Modified: cfe/trunk/lib/ARCMigrate/ObjCMT.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/ObjCMT.cpp?rev=192826&r1=192825&r2=192826&view=diff
==============================================================================
--- cfe/trunk/lib/ARCMigrate/ObjCMT.cpp (original)
+++ cfe/trunk/lib/ARCMigrate/ObjCMT.cpp Wed Oct 16 13:52:17 2013
@@ -285,12 +285,12 @@ static bool rewriteToObjCProperty(const
   if (!Setter)
     append_attr(PropertyString, "readonly");
   
-  // Short circuit properties that contain the name "delegate" or "dataSource",
-  // or have exact name "target" to have unsafe_unretained attribute.
+  // Short circuit 'delegate' properties that contain the name "delegate" or
+  // "dataSource", or have exact name "target" to have 'assign' attribute.
   if (PropertyName.equals("target") ||
       (PropertyName.find("delegate") != StringRef::npos) ||
       (PropertyName.find("dataSource") != StringRef::npos))
-    append_attr(PropertyString, "unsafe_unretained");
+    append_attr(PropertyString, "assign");
   else if (Setter) {
     const ParmVarDecl *argDecl = *Setter->param_begin();
     QualType ArgType = Context.getCanonicalType(argDecl->getType());

Modified: cfe/trunk/test/ARCMT/objcmt-arc-cf-annotations.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/objcmt-arc-cf-annotations.m.result?rev=192826&r1=192825&r2=192826&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/objcmt-arc-cf-annotations.m.result (original)
+++ cfe/trunk/test/ARCMT/objcmt-arc-cf-annotations.m.result Wed Oct 16 13:52:17 2013
@@ -2090,6 +2090,6 @@ CFAttributedStringRef CFAttributedCreate
 @interface Action
 @property (nonatomic) SEL action;
 
- at property (nonatomic, unsafe_unretained) id target;
+ at property (nonatomic, assign) id target;
 
 @end

Modified: cfe/trunk/test/ARCMT/objcmt-atomic-property.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/objcmt-atomic-property.m.result?rev=192826&r1=192825&r2=192826&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/objcmt-atomic-property.m.result (original)
+++ cfe/trunk/test/ARCMT/objcmt-atomic-property.m.result Wed Oct 16 13:52:17 2013
@@ -65,12 +65,12 @@ typedef char BOOL;
 // Properties that contain the name "delegate" or "dataSource",
 // or have exact name "target" have unsafe_unretained attribute.
 @interface NSInvocation 
- at property (atomic, unsafe_unretained) id target;
+ at property (atomic, assign) id target;
 
 
- at property (atomic, unsafe_unretained) id dataSource;
+ at property (atomic, assign) id dataSource;
 
- at property (atomic, unsafe_unretained) id xxxdelegateYYY;
+ at property (atomic, assign) id xxxdelegateYYY;
 
 
 
@@ -117,12 +117,12 @@ typedef char BOOL;
 
 
 @interface NSInvocation(CAT)
- at property (atomic, unsafe_unretained) id target;
+ at property (atomic, assign) id target;
 
 
- at property (atomic, unsafe_unretained) id dataSource;
+ at property (atomic, assign) id dataSource;
 
- at property (atomic, unsafe_unretained) id xxxdelegateYYY;
+ at property (atomic, assign) id xxxdelegateYYY;
 
 
 

Modified: cfe/trunk/test/ARCMT/objcmt-property.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/objcmt-property.m.result?rev=192826&r1=192825&r2=192826&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/objcmt-property.m.result (original)
+++ cfe/trunk/test/ARCMT/objcmt-property.m.result Wed Oct 16 13:52:17 2013
@@ -65,12 +65,12 @@ typedef char BOOL;
 // Properties that contain the name "delegate" or "dataSource",
 // or have exact name "target" have unsafe_unretained attribute.
 @interface NSInvocation 
- at property (nonatomic, unsafe_unretained) id target;
+ at property (nonatomic, assign) id target;
 
 
- at property (nonatomic, unsafe_unretained) id dataSource;
+ at property (nonatomic, assign) id dataSource;
 
- at property (nonatomic, unsafe_unretained) id xxxdelegateYYY;
+ at property (nonatomic, assign) id xxxdelegateYYY;
 
 
 
@@ -117,12 +117,12 @@ typedef char BOOL;
 
 
 @interface NSInvocation(CAT)
- at property (nonatomic, unsafe_unretained) id target;
+ at property (nonatomic, assign) id target;
 
 
- at property (nonatomic, unsafe_unretained) id dataSource;
+ at property (nonatomic, assign) id dataSource;
 
- at property (nonatomic, unsafe_unretained) id xxxdelegateYYY;
+ at property (nonatomic, assign) id xxxdelegateYYY;