[4.2-04-30] cherry-pick migrator changes

lib/Migrator/APIDiffMigratorPass.cpp

@@ -229,6 +229,9 @@ class ChildIndexFinder : public TypeReprVisitor<ChildIndexFinder, FoundResult> {
 };
 
 static ValueDecl* getReferencedDecl(Expr *E) {
+  // Get the syntactic expression out of an implicit expression.
+  if (auto *ICE = dyn_cast<ImplicitConversionExpr>(E))
+    E = ICE->getSyntacticSubExpr();
   if (auto *DRE = dyn_cast<DeclRefExpr>(E)) {
     return DRE->getDecl();
   } else if (auto *MRE = dyn_cast<MemberRefExpr>(E)) {
@@ -309,7 +312,15 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
   APIDiffMigratorPass(EditorAdapter &Editor, SourceFile *SF,
                       const MigratorOptions &Opts):
     ASTMigratorPass(Editor, SF, Opts),
-    FileEndLoc(SM.getRangeForBuffer(BufferID).getEnd()) {}
+    FileEndLoc(SM.getRangeForBuffer(BufferID).getEnd()) {
+      SmallVector<Decl*, 16> TopDecls;
+      SF->getTopLevelDecls(TopDecls);
+      for (auto *D: TopDecls) {
+        if (auto *FD = dyn_cast<FuncDecl>(D)) {
+          InsertedFunctions.insert(FD->getBaseName().getIdentifier().str());
+        }
+      }
+    }
 
   void run() {
     if (Opts.APIDigesterDataStorePaths.empty())
@@ -675,6 +686,11 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     }
   }
 
+  void replaceExpr(Expr* E, StringRef Text) {
+    Editor.replace(CharSourceRange(SM, E->getStartLoc(),
+      Lexer::getLocForEndOfToken(SM, E->getEndLoc())), Text);
+  }
+
   bool wrapAttributeReference(Expr* Reference, Expr* WrapperTarget,
                               bool FromString) {
     auto *RD = getReferencedDecl(Reference);
@@ -699,18 +715,26 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     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);
+      replaceExpr(Reference, Rename);
     }
     return true;
   }
 
   bool handleAssignDestMigration(Expr *E) {
+    Editor.disableCache();
+    SWIFT_DEFER { Editor.enableCache(); };
     auto *ASE = dyn_cast<AssignExpr>(E);
     if (!ASE || !ASE->getDest() || !ASE->getSrc())
       return false;
-    return wrapAttributeReference(ASE->getDest(), ASE->getSrc(), true);
+    auto *Dest = ASE->getDest();
+    auto Src = ASE->getSrc();
+    if (wrapAttributeReference(Dest, Src, true)) {
+      // We should handle the assignment source here since we won't visit
+      // the children with present changes.
+      handleAttributeReference(Src);
+      return true;
+    }
+    return false;
   }
 
   bool handleAttributeReference(Expr *E) {

test/Migrator/avoid_insert_existing_functions.swift

@@ -0,0 +1,22 @@
+// REQUIRES: objc_interop
+// RUN: %empty-directory(%t.mod)
+// RUN: %target-swift-frontend -emit-module -o %t.mod/Cities.swiftmodule %S/Inputs/Cities.swift -module-name Cities -parse-as-library
+// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s  -I %t.mod -api-diff-data-file %S/Inputs/string-representable.json -emit-migrated-file-path %t/avoid_insert_existing_functions.swift.result -disable-migrator-fixits -o /dev/null
+// RUN: diff -u %S/avoid_insert_existing_functions.swift.expected %t/avoid_insert_existing_functions.swift.result
+
+import Cities
+
+typealias NewAttribute = String
+
+func foo(_ c: Container) -> String {
+  c.Value = ""
+  return c.Value
+}
+
+fileprivate func convertToNewAttribute(_ input: String) -> NewAttribute {
+ return ""
+}
+
+fileprivate func convertFromNewAttribute(_ input: NewAttribute) -> String {
+ return ""
+}

test/Migrator/avoid_insert_existing_functions.swift.expected

@@ -0,0 +1,22 @@
+// REQUIRES: objc_interop
+// RUN: %empty-directory(%t.mod)
+// RUN: %target-swift-frontend -emit-module -o %t.mod/Cities.swiftmodule %S/Inputs/Cities.swift -module-name Cities -parse-as-library
+// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s  -I %t.mod -api-diff-data-file %S/Inputs/string-representable.json -emit-migrated-file-path %t/avoid_insert_existing_functions.swift.result -disable-migrator-fixits -o /dev/null
+// RUN: diff -u %S/avoid_insert_existing_functions.swift.expected %t/avoid_insert_existing_functions.swift.result
+
+import Cities
+
+typealias NewAttribute = String
+
+func foo(_ c: Container) -> String {
+  c.Value = convertToNewAttribute("")
+  return convertFromNewAttribute(c.Value)
+}
+
+fileprivate func convertToNewAttribute(_ input: String) -> NewAttribute {
+ return ""
+}
+
+fileprivate func convertFromNewAttribute(_ input: NewAttribute) -> String {
+ return ""
+}

test/Migrator/string-representable.swift

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

test/Migrator/string-representable.swift.expected

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