Merge pull request #16484 from nkcsgexi/migrator-cherry-pick-05-09-4-30

nkcsgexi · web-flow · commit f4c39a6af342 · 2018-05-09T21:15:52.000-07:00
[4.2-04-30] Cherry-pick migrator changes
diff --git a/lib/Migrator/APIDiffMigratorPass.cpp b/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();
diff --git a/test/Migrator/Inputs/Cities.swift b/test/Migrator/Inputs/Cities.swift
@@ -59,3 +59,5 @@ public class ToplevelType {
   public init() {}
   public init(recordName: String) {}
 }
+
+public var GlobalAttribute: String = ""
diff --git a/test/Migrator/Inputs/string-representable.json b/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"
+  },
 ]
diff --git a/test/Migrator/string-representable.swift b/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
 }
diff --git a/test/Migrator/string-representable.swift.expected b/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)
 }
 
diff --git a/test/api-digester/Inputs/APINotesLeft/APINotesTest.h b/test/api-digester/Inputs/APINotesLeft/APINotesTest.h
@@ -26,3 +26,5 @@ extern int ANTGlobalValue;
 + (nonnull AnimalStatusDescriptor *)animalStatusSingleOptionalAttribute:(nullable NSString *)attributes;
 + (nonnull AnimalStatusDescriptor *)animalStatusSingleAttribute:(nonnull NSString *)attributes;
 @end
+
+extern NSString *globalAttributeName;
diff --git a/test/api-digester/Inputs/APINotesRight/APINotesTest.h b/test/api-digester/Inputs/APINotesRight/APINotesTest.h
@@ -26,3 +26,5 @@ typedef NSString * AnimalAttributeName NS_STRING_ENUM;
 + (nonnull AnimalStatusDescriptor *)animalStatusSingleOptionalAttribute:(nullable AnimalAttributeName)attributes;
 + (nonnull AnimalStatusDescriptor *)animalStatusSingleAttribute:(nonnull AnimalAttributeName)attributes;
 @end
+
+extern AnimalAttributeName globalAttributeName;
diff --git a/test/api-digester/Outputs/apinotes-diags-3-4.txt b/test/api-digester/Outputs/apinotes-diags-3-4.txt
@@ -7,6 +7,7 @@ APINotesTest(APINotesTest.h): TypeAlias AnimalAttributeName(NSString) is now Str
 /* Moved Decls */
 
 /* Renamed Decls */
+APINotesTest(APINotesTest.h): Var globalAttributeName has been renamed to Var AnimalAttributeName.globalAttributeName
 
 /* Type Changes */
 APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [String : Any] to [AnimalAttributeName : Any]
diff --git a/test/api-digester/Outputs/apinotes-diags.txt b/test/api-digester/Outputs/apinotes-diags.txt
@@ -11,6 +11,7 @@ APINotesTest(APINotesTest.h): Func SwiftTypeWithMethodLeft.getPropertyA() has be
 /* Renamed Decls */
 APINotesTest(APINotesTest.h): Protocol SwiftTypeWithMethodLeft has been renamed to Protocol SwiftTypeWithMethodRight
 APINotesTest(APINotesTest.h): Var OldType.oldMember has been renamed to Var NewType.newMember
+APINotesTest(APINotesTest.h): Var globalAttributeName has been renamed to Var AnimalAttributeName.globalAttributeName
 
 /* Type Changes */
 APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [String : Any] to [AnimalAttributeName : Any]
diff --git a/test/api-digester/Outputs/apinotes-migrator-gen.json b/test/api-digester/Outputs/apinotes-migrator-gen.json
@@ -230,6 +230,25 @@
     "RightComment": "SwiftTypeWithMethodRight",
     "ModuleName": "APINotesTest"
   },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Var",
+    "NodeAnnotation": "SimpleStringRepresentableUpdate",
+    "ChildIndex": "0",
+    "LeftUsr": "c:@globalAttributeName",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "AnimalAttributeName",
+    "ModuleName": "APINotesTest"
+  },
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "c:@globalAttributeName",
+    "OldPrintedName": "globalAttributeName",
+    "OldTypeName": "",
+    "NewPrintedName": "globalAttributeName",
+    "NewTypeName": "AnimalAttributeName"
+  },
   {
     "DiffItemKind": "TypeMemberDiffItem",
     "Usr": "c:@ANTGlobalValue",
diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp
@@ -2628,9 +2628,8 @@ class SearchVisitor : public SDKNodeVisitor {
   }
 };
 
-class ChangeRefinementPass : public SDKTreeDiffPass, public SDKNodeVisitor {
+class InterfaceTypeChangeDetector {
   bool IsVisitingLeft;
-  UpdatedNodesMap &UpdateMap;
 
 #define ANNOTATE(Node, Counter, X, Y)                                          \
   auto ToAnnotate = IsVisitingLeft ? Node : Counter;                           \
@@ -2828,41 +2827,57 @@ class ChangeRefinementPass : public SDKTreeDiffPass, public SDKNodeVisitor {
     return false;
   }
 
-  bool isUnhandledCase(SDKNodeType *Node) {
-    auto Counter = UpdateMap.findUpdateCounterpart(Node)->getAs<SDKNodeType>();
+  bool isUnhandledCase(SDKNodeType *Node, SDKNodeType *Counter) {
     return Node->getTypeKind() == KnownTypeKind::Void ||
            Counter->getTypeKind() == KnownTypeKind::Void;
   }
 
 public:
-  ChangeRefinementPass(UpdatedNodesMap &UpdateMap) : UpdateMap(UpdateMap) {}
+  InterfaceTypeChangeDetector(bool IsVisitingLeft):
+    IsVisitingLeft(IsVisitingLeft) {}
+  void detect(SDKNode *Left, SDKNode *Right) {
+    auto *Node = dyn_cast<SDKNodeType>(Left);
+    auto *Counter = dyn_cast<SDKNodeType>(Right);
+    if (!Node || !Counter || isUnhandledCase(Node, Counter))
+      return;
+    bool Result = detectWrapOptional(Node, Counter)||
+              detectOptionalUpdate(Node, Counter)||
+              detectWrapImplicitOptional(Node, Counter)||
+              detectUnmanagedUpdate(Node, Counter)||
+              detectDictionaryKeyChange(Node, Counter) ||
+              detectArrayMemberChange(Node, Counter) ||
+              detectSimpleStringRepresentableUpdate(Node, Counter) ||
+              detectTypeRewritten(Node, Counter);
+    (void) Result;
+    return;
+  }
+};
+
+class ChangeRefinementPass : public SDKTreeDiffPass, public SDKNodeVisitor {
+  UpdatedNodesMap &UpdateMap;
+  InterfaceTypeChangeDetector LeftDetector;
+  InterfaceTypeChangeDetector RightDetector;
+  InterfaceTypeChangeDetector *Detector;
+
+public:
+  ChangeRefinementPass(UpdatedNodesMap &UpdateMap) : UpdateMap(UpdateMap),
+    LeftDetector(true), RightDetector(false), Detector(nullptr) {}
 
   void pass(NodePtr Left, NodePtr Right) override {
 
     // Post-order visit is necessary since we propagate annotations bottom-up
-    IsVisitingLeft = true;
+    Detector = &LeftDetector;
     SDKNode::postorderVisit(Left, *this);
-    IsVisitingLeft = false;
+    Detector = &RightDetector;
     SDKNode::postorderVisit(Right, *this);
   }
 
-  void visit(NodePtr N) override {
-    auto Node = dyn_cast<SDKNodeType>(N);
-    if (!Node || !Node->isAnnotatedAs(NodeAnnotation::Updated) ||
-        isUnhandledCase(Node))
+  void visit(NodePtr Node) override {
+    assert(Detector);
+    if (!Node || !Node->isAnnotatedAs(NodeAnnotation::Updated))
       return;
-    auto Counter = const_cast<SDKNodeType*>(UpdateMap.
-      findUpdateCounterpart(Node)->getAs<SDKNodeType>());
-
-    bool Result = detectWrapOptional(Node, Counter)||
-                  detectOptionalUpdate(Node, Counter)||
-                  detectWrapImplicitOptional(Node, Counter)||
-                  detectUnmanagedUpdate(Node, Counter)||
-                  detectDictionaryKeyChange(Node, Counter) ||
-                  detectArrayMemberChange(Node, Counter) ||
-                  detectSimpleStringRepresentableUpdate(Node, Counter) ||
-                  detectTypeRewritten(Node, Counter);
-    (void) Result;
+    auto *Counter = UpdateMap.findUpdateCounterpart(Node);
+    Detector->detect(Node, Counter);
     return;
   }
 };
@@ -3585,9 +3600,15 @@ class OverloadMemberFunctionEmitter : public SDKNodeVisitor {
 namespace fs = llvm::sys::fs;
 namespace path = llvm::sys::path;
 
-struct RenameDetectorForMemberDiff : public MatchedNodeListener {
+class RenameDetectorForMemberDiff : public MatchedNodeListener {
+  InterfaceTypeChangeDetector LeftDetector;
+  InterfaceTypeChangeDetector RightDetector;
+public:
+  RenameDetectorForMemberDiff(): LeftDetector(true), RightDetector(false) {}
   void foundMatch(NodePtr Left, NodePtr Right) override {
     detectRename(Left, Right);
+    LeftDetector.detect(Left, Right);
+    RightDetector.detect(Right, Left);
   }
   void workOn(NodePtr Left, NodePtr Right) {
     if (Left->getKind() == Right->getKind() &&
@@ -3596,6 +3617,12 @@ struct RenameDetectorForMemberDiff : public MatchedNodeListener {
                                     *this);
       SNMatcher.match();
     }
+    if (Left->getKind() == Right->getKind() &&
+        Left->getKind() == SDKNodeKind::DeclVar) {
+      SequentialNodeMatcher Matcher(Left->getChildren(),
+                                    Right->getChildren(), *this);
+      Matcher.match();
+    }
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -59,3 +59,5 @@ public class ToplevelType {`
`59`	`59`	`public init() {}`
`60`	`60`	`public init(recordName: String) {}`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+public var GlobalAttribute: String = ""`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ func foo(_ c: Container) -> String {`
`34`	`34`	`c.adding(attributes: c.attrDict)`
`35`	`35`	`_ = Container(optionalAttrArray: c.attrArr)`
`36`	`36`	`c.adding(optionalAttributes: c.optionalAttrDict)`
	`37`	`+ _ = GlobalAttribute`
`37`	`38`	`return c.Value`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ func foo(_ c: Container) -> String {`
`34`	`34`	`c.adding(attributes: convertToSimpleAttributeDictionary(convertFromSimpleAttributeDictionary(c.attrDict)))`
`35`	`35`	`_ = Container(optionalAttrArray: convertToOptionalSimpleAttributeArray(convertFromSimpleAttributeArray(c.attrArr)))`
`36`	`36`	`c.adding(optionalAttributes: convertToOptionalSimpleAttributeDictionary(convertFromOptionalSimpleAttributeDictionary(c.optionalAttrDict)))`
	`37`	`+ _ = convertFromNewAttribute(AttributeWrapper.NewAttribute)`
`37`	`38`	`return convertFromNewAttribute(c.Value)`
`38`	`39`	`}`
`39`	`40`