From a830ea7431afca36431825f028a3c7817d1a940d Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Wed, 10 Jul 2013 00:20:11 +0000 Subject: objc migrator: More refinment of property attributes in migration. Specialli use of 'copy' attribute for retainable object types. llvm-svn: 185985 --- clang/lib/Edit/RewriteObjCFoundationAPI.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'clang/lib/Edit/RewriteObjCFoundationAPI.cpp') diff --git a/clang/lib/Edit/RewriteObjCFoundationAPI.cpp b/clang/lib/Edit/RewriteObjCFoundationAPI.cpp index 05abbed14c3..e257a0b6f1c 100644 --- a/clang/lib/Edit/RewriteObjCFoundationAPI.cpp +++ b/clang/lib/Edit/RewriteObjCFoundationAPI.cpp @@ -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()); -- cgit v1.2.3