migrator: make sure we can handle the composite change of rename and string representable update. radr://40076924

Author: nkcsgexi

lib/Migrator/APIDiffMigratorPass.cpp

@@ -347,9 +347,6 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
         Editor.replace(Range, RepText);
         return true;
       }
-      if (updateStringRepresentableDeclRef(Item, Range)) {
-        return true;
-      }
     }
     return true;
   }
@@ -683,20 +680,30 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     auto *RD = getReferencedDecl(Reference);
     if (!RD)
       return false;
+    std::string Func;
+    std::string Rename;
     for (auto *Item: getRelatedDiffItems(RD)) {
-      if (auto *CI = dyn_cast<CommonDiffItem>(Item)) {
+      if (isSimpleReplacement(Item, Rename)) {
+      } else if (auto *CI = dyn_cast<CommonDiffItem>(Item)) {
         if (CI->isStringRepresentableChange() &&
             CI->NodeKind == SDKNodeKind::DeclVar) {
           SmallString<256> Buffer;
-          auto Func = insertHelperFunction(CI->DiffKind, CI->RightComment,
-                                           Buffer, FromString);
-          Editor.insert(WrapperTarget->getStartLoc(), (Twine(Func) + "(").str());
-          Editor.insertAfterToken(WrapperTarget->getEndLoc(), ")");
-          return true;
+          Func = insertHelperFunction(CI->DiffKind, CI->RightComment, Buffer,
+            FromString);
         }
       }
     }
-    return false;
+    if (Func.empty())
+      return false;
+
+    Editor.insert(WrapperTarget->getStartLoc(), (Twine(Func) + "(").str());
+    Editor.insertAfterToken(WrapperTarget->getEndLoc(), ")");
+    if (!Rename.empty()) {
+      auto Range = CharSourceRange(SM, Reference->getStartLoc(),
+        Lexer::getLocForEndOfToken(SM, Reference->getEndLoc()));
+      Editor.replace(Range, Rename);
+    }
+    return true;
   }
 
   bool handleAssignDestMigration(Expr *E) {
@@ -827,7 +834,9 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
   bool walkToExprPre(Expr *E) override {
     if (handleQualifiedReplacement(E))
       return false;
-    if (handleAssignDestMigration(E) || handleAttributeReference(E))
+    if (handleAssignDestMigration(E))
+      return false;
+    if (handleAttributeReference(E))
       return false;
     if (auto *CE = dyn_cast<CallExpr>(E)) {
       auto Fn = CE->getFn();

test/Migrator/Inputs/Cities.swift

@@ -59,3 +59,5 @@ public class ToplevelType {
   public init() {}
   public init(recordName: String) {}
 }
+
+public var GlobalAttribute: String = ""

test/Migrator/Inputs/string-representable.json

@@ -197,4 +197,23 @@
     "RightComment": "SimpleAttribute",
     "ModuleName": "Cities"
   },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Var",
+    "NodeAnnotation": "SimpleStringRepresentableUpdate",
+    "ChildIndex": "0",
+    "LeftUsr": "s:6Cities15GlobalAttributeSSvp",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "NewAttribute",
+    "ModuleName": "Cities"
+  },
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "s:6Cities15GlobalAttributeSSvp",
+    "OldPrintedName": "GlobalAttribute",
+    "OldTypeName": "",
+    "NewPrintedName": "NewAttribute",
+    "NewTypeName": "AttributeWrapper"
+  },
 ]

test/Migrator/string-representable.swift

@@ -34,5 +34,6 @@ func foo(_ c: Container) -> String {
   c.adding(attributes: c.attrDict)
   _ = Container(optionalAttrArray: c.attrArr)
   c.adding(optionalAttributes: c.optionalAttrDict)
+  _ = GlobalAttribute
   return c.Value
 }

test/Migrator/string-representable.swift.expected

@@ -34,6 +34,7 @@ func foo(_ c: Container) -> String {
   c.adding(attributes: convertToSimpleAttributeDictionary(convertFromSimpleAttributeDictionary(c.attrDict)))
   _ = Container(optionalAttrArray: convertToOptionalSimpleAttributeArray(convertFromSimpleAttributeArray(c.attrArr)))
   c.adding(optionalAttributes: convertToOptionalSimpleAttributeDictionary(convertFromOptionalSimpleAttributeDictionary(c.optionalAttrDict)))
+  _ = convertFromNewAttribute(AttributeWrapper.NewAttribute)
   return convertFromNewAttribute(c.Value)
 }