Merge pull request #16803 from nkcsgexi/api-digester-alias-to-raw

Author: swift-ci

include/swift/IDE/DigesterEnums.def

@@ -79,6 +79,7 @@ NODE_ANNOTATION_CHANGE_KIND(ArrayMemberUpdate)
 NODE_ANNOTATION_CHANGE_KIND(OptionalArrayMemberUpdate)
 NODE_ANNOTATION_CHANGE_KIND(SimpleStringRepresentableUpdate)
 NODE_ANNOTATION_CHANGE_KIND(SimpleOptionalStringRepresentableUpdate)
+NODE_ANNOTATION_CHANGE_KIND(TypeAliasDeclToRawRepresentable)
 
 NODE_ANNOTATION_CHANGE_KIND(RevertDictionaryKeyUpdate)
 NODE_ANNOTATION_CHANGE_KIND(RevertOptionalDictionaryKeyUpdate)

test/api-digester/Inputs/APINotesLeft/APINotesTest.h

@@ -28,3 +28,5 @@ extern int ANTGlobalValue;
 @end
 
 extern NSString *globalAttributeName;
+
+typedef NSString * CatAttributeName;

test/api-digester/Inputs/APINotesRight/APINotesTest.h

@@ -28,3 +28,5 @@ typedef NSString * AnimalAttributeName NS_STRING_ENUM;
 @end
 
 extern AnimalAttributeName globalAttributeName;
+
+typedef NSString * CatAttributeName NS_STRING_ENUM;

test/api-digester/Outputs/apinotes-diags.txt

@@ -1,5 +1,6 @@
 
 /* RawRepresentable Changes */
+APINotesTest(APINotesTest.h): TypeAlias CatAttributeName(NSString) is now String representable
 
 /* Removed Decls */
 APINotesTest(APINotesTest.h): Func ObjcProt.protMemberFunc2() has been removed

test/api-digester/Outputs/apinotes-migrator-gen.json

@@ -10,6 +10,17 @@
     "RightComment": "AnimalAttributeName",
     "ModuleName": "APINotesTest"
   },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "TypeAlias",
+    "NodeAnnotation": "TypeAliasDeclToRawRepresentable",
+    "ChildIndex": "0",
+    "LeftUsr": "c:APINotesTest.h@T@CatAttributeName",
+    "LeftComment": "NSString",
+    "RightUsr": "",
+    "RightComment": "String",
+    "ModuleName": "APINotesTest"
+  },
   {
     "DiffItemKind": "CommonDiffItem",
     "NodeKind": "Function",

tools/swift-api-digester/swift-api-digester.cpp

@@ -3806,6 +3806,22 @@ static int compareSDKs(StringRef LeftPath, StringRef RightPath,
   RefinementPass.pass(LeftModule, RightModule);
   DiffVector AllItems;
   DiffItemEmitter::collectDiffItems(LeftModule, AllItems);
+
+  auto &AliasMap = Ctx.getTypeAliasUpdateMap();
+  // Find type alias change first.
+  TypeAliasDiffFinder(LeftModule, RightModule, AliasMap).search();
+
+  for (auto Pair: AliasMap) {
+    auto Left = Pair.first->getAs<SDKNodeDeclTypeAlias>()->getUnderlyingType()->
+      getPrintedName();
+    auto Right = AliasMap[(SDKNode*)Pair.first]->getAs<SDKNodeDeclType>()->
+      getRawValueType()->getPrintedName();
+    auto *D = Pair.first->getAs<SDKNodeDecl>();
+    AllItems.emplace_back(SDKNodeKind::DeclTypeAlias,
+      NodeAnnotation::TypeAliasDeclToRawRepresentable, "0",
+      D->getUsr(), "", Left, Right, D->getModuleName());
+  }
+
   AllItems.erase(std::remove_if(AllItems.begin(), AllItems.end(),
                                 [&](CommonDiffItem &Item) {
     return Item.DiffKind == NodeAnnotation::RemovedDecl &&