aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ARCMigrate/TransProperties.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ARCMigrate/TransProperties.cpp b/lib/ARCMigrate/TransProperties.cpp
index f8bc8a3c5f..b36acbb205 100644
--- a/lib/ARCMigrate/TransProperties.cpp
+++ b/lib/ARCMigrate/TransProperties.cpp
@@ -50,7 +50,7 @@ class PropertiesRewriter {
enum PropActionKind {
PropAction_None,
- PropAction_RetainRemoved,
+ PropAction_RetainReplacedWithStrong,
PropAction_AssignRemoved,
PropAction_AssignRewritten,
PropAction_MaybeAddWeakOrUnsafe
@@ -161,9 +161,11 @@ private:
switch (kind) {
case PropAction_None:
return;
- case PropAction_RetainRemoved:
- removeAttribute("retain", atLoc);
+ case PropAction_RetainReplacedWithStrong: {
+ StringRef toAttr = "strong";
+ MigrateCtx.rewritePropertyAttribute("retain", toAttr, atLoc);
return;
+ }
case PropAction_AssignRemoved:
return removeAssignForDefaultStrong(props, atLoc);
case PropAction_AssignRewritten:
@@ -193,7 +195,7 @@ private:
if (propAttrs & ObjCPropertyDecl::OBJC_PR_retain) {
// strong is the default.
- return doPropAction(PropAction_RetainRemoved, props, atLoc);
+ return doPropAction(PropAction_RetainReplacedWithStrong, props, atLoc);
}
bool HasIvarAssignedAPlusOneObject = hasIvarAssignedAPlusOneObject(props);