maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

objc migrator: More refinment of property 

attributes in migration. Specialli use of
'copy' attribute for retainable object types.

llvm-svn: 185985
This commit is contained in:
Fariborz Jahanian 2013-07-10 00:20:11 +00:00
parent 93ebdd727f
commit a830ea7431
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/Edit/RewriteObjCFoundationAPI.cpp
View File

@ -362,16 +362,16 @@ bool edit::rewriteToObjCProperty(const ObjCMethodDecl *Getter,
const ParmVarDecl *argDecl = *Setter->param_begin();
QualType ArgType = argDecl->getType();
Qualifiers::ObjCLifetime propertyLifetime = ArgType.getObjCLifetime();
if (propertyLifetime != Qualifiers::OCL_None) {
PropertyString += "(";
if (propertyLifetime == Qualifiers::OCL_Strong)
PropertyString += "strong";
else if (propertyLifetime == Qualifiers::OCL_Weak)
PropertyString += "weak";
else
PropertyString += "unsafe_unretained";
PropertyString += ")";
if (ArgType->isObjCRetainableType() &&
propertyLifetime == Qualifiers::OCL_Strong) {
PropertyString += "(copy)";
}
else if (propertyLifetime == Qualifiers::OCL_Weak)
PropertyString += "(weak)";
else
PropertyString += "(unsafe_unretained)";
QualType PropQT = Getter->getResultType();
PropertyString += " ";
PropertyString += PropQT.getAsString(NS.getASTContext().getPrintingPolicy());

10
clang/test/ARCMT/objcmt-property.m.result
View File

@ -12,7 +12,7 @@
@property(weak) NSString *__weak WeakProp;
@property(strong) NSString * StrongProp;
@property(copy) NSString * StrongProp;
- (NSString *) UnavailProp __attribute__((unavailable));
@ -42,8 +42,8 @@
@property(strong) NSArray * names2;
@property(strong) NSArray * names3;
@property(strong) NSArray *__strong names4;
@property(strong) NSArray * names1;
@property(copy) NSArray * names2;
@property(copy) NSArray * names3;
@property(copy) NSArray *__strong names4;
@property(copy) NSArray * names1;
@end