swift-api-digester: teach the tool to serialize USRs for nominal type. (#15463)

nkcsgexi · web-flow · commit 20a48e5adb44 · 2018-03-23T16:29:54.000-07:00
This allows us to map back from a type to the declaration in the dump,
so that we can perform more fine-grained analysis like whether a string
has been changed to string enum.
diff --git a/test/api-digester/Inputs/APINotesLeft/APINotesTest.h b/test/api-digester/Inputs/APINotesLeft/APINotesTest.h
@@ -1,3 +1,4 @@
+#import <Foundation.h>
 extern int ANTGlobalValue;
 
 @interface NewType
@@ -16,3 +17,7 @@ extern int ANTGlobalValue;
   -(void) ProtMemberFunc2;
   -(void) ProtMemberFunc3;
 @end
+
+@interface AnimalStatusDescriptor
+- (nonnull AnimalStatusDescriptor *)animalStatusDescriptorByAddingAttributes:(nonnull NSDictionary<NSString*, id> *)attributes;
+@end
diff --git a/test/api-digester/Inputs/APINotesRight/APINotesTest.h b/test/api-digester/Inputs/APINotesRight/APINotesTest.h
@@ -1,3 +1,4 @@
+#import <objc_generics.h>
 extern int ANTGlobalValue;
 
 @interface NewType
@@ -14,3 +15,9 @@ extern int ANTGlobalValue;
 @protocol ObjcProt
   -(void) ProtMemberFunc;
 @end
+
+typedef NSString * AnimalAttributeName NS_STRING_ENUM;
+
+@interface AnimalStatusDescriptor
+- (nonnull AnimalStatusDescriptor *)animalStatusDescriptorByAddingAttributes:(nonnull NSDictionary<AnimalAttributeName, id> *)attributes;
+@end
diff --git a/test/api-digester/Inputs/cake.swift b/test/api-digester/Inputs/cake.swift
@@ -35,3 +35,5 @@ public func foo2(_ a: Int = #line, b: S1) {}
 public enum Number: Int {
   case one
 }
+
+public func foo3(_ a: [Int: String]) {}
diff --git a/test/api-digester/Outputs/apinotes-diags.txt b/test/api-digester/Outputs/apinotes-diags.txt
@@ -11,5 +11,6 @@ APINotesTest(APINotesTest.h): Func SwiftTypeWithMethodLeft.getPropertyA() has be
 APINotesTest(APINotesTest.h): Protocol SwiftTypeWithMethodLeft has been renamed to Protocol SwiftTypeWithMethodRight
 
 /* Type Changes */
+APINotesTest(APINotesTest.h): Func AnimalStatusDescriptor.addingAttributes(_:) has parameter 0 type change from [String : Any] to [AnimalAttributeName : Any]
 
 /* Decl Attribute changes */
diff --git a/test/api-digester/Outputs/apinotes-migrator-gen.json b/test/api-digester/Outputs/apinotes-migrator-gen.json
@@ -1,4 +1,26 @@
 [
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "TypeRewritten",
+    "ChildIndex": "1:0",
+    "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingAttributes:",
+    "LeftComment": "String",
+    "RightUsr": "",
+    "RightComment": "AnimalAttributeName",
+    "ModuleName": "APINotesTest"
+  },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "TypeRewritten",
+    "ChildIndex": "1:0",
+    "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingAttributes:",
+    "LeftComment": "String",
+    "RightUsr": "",
+    "RightComment": "AnimalAttributeName",
+    "ModuleName": "APINotesTest"
+  },
   {
     "DiffItemKind": "CommonDiffItem",
     "NodeKind": "Function",
diff --git a/test/api-digester/Outputs/cake.json b/test/api-digester/Outputs/cake.json
@@ -43,6 +43,7 @@
               "kind": "TypeNominal",
               "name": "C0",
               "printedName": "C0<T1, T2, T3>",
+              "usr": "s:4cake2C0C",
               "children": [
                 {
                   "kind": "TypeNominal",
@@ -188,7 +189,8 @@
             {
               "kind": "TypeNominal",
               "name": "S1",
-              "printedName": "S1"
+              "printedName": "S1",
+              "usr": "s:4cake2S1V"
             }
           ]
         }
@@ -249,11 +251,13 @@
                   "kind": "TypeNominal",
                   "name": "Optional",
                   "printedName": "C1?",
+                  "usr": "s:Sq",
                   "children": [
                     {
                       "kind": "TypeNominal",
                       "name": "C1",
-                      "printedName": "C1"
+                      "printedName": "C1",
+                      "usr": "s:4cake2C1C"
                     }
                   ]
                 }
@@ -277,11 +281,13 @@
                   "kind": "TypeNominal",
                   "name": "Optional",
                   "printedName": "C1?",
+                  "usr": "s:Sq",
                   "children": [
                     {
                       "kind": "TypeNominal",
                       "name": "C1",
-                      "printedName": "C1"
+                      "printedName": "C1",
+                      "usr": "s:4cake2C1C"
                     }
                   ]
                 }
@@ -316,7 +322,8 @@
                 {
                   "kind": "TypeNominal",
                   "name": "C1",
-                  "printedName": "C1"
+                  "printedName": "C1",
+                  "usr": "s:4cake2C1C"
                 }
               ]
             },
@@ -337,7 +344,8 @@
                 {
                   "kind": "TypeNominal",
                   "name": "C1",
-                  "printedName": "C1"
+                  "printedName": "C1",
+                  "usr": "s:4cake2C1C"
                 }
               ]
             }
@@ -355,7 +363,8 @@
             {
               "kind": "TypeNominal",
               "name": "C1",
-              "printedName": "C1"
+              "printedName": "C1",
+              "usr": "s:4cake2C1C"
             }
           ]
         }
@@ -379,12 +388,14 @@
           "kind": "TypeNominal",
           "name": "Int",
           "printedName": "Int",
-          "hasDefaultArg": true
+          "hasDefaultArg": true,
+          "usr": "s:Si"
         },
         {
           "kind": "TypeNominal",
           "name": "S1",
-          "printedName": "S1"
+          "printedName": "S1",
+          "usr": "s:4cake2S1V"
         }
       ]
     },
@@ -406,12 +417,50 @@
           "kind": "TypeNominal",
           "name": "Int",
           "printedName": "Int",
-          "hasDefaultArg": true
+          "hasDefaultArg": true,
+          "usr": "s:Si"
         },
         {
           "kind": "TypeNominal",
           "name": "S1",
-          "printedName": "S1"
+          "printedName": "S1",
+          "usr": "s:4cake2S1V"
+        }
+      ]
+    },
+    {
+      "kind": "Function",
+      "name": "foo3",
+      "printedName": "foo3(_:)",
+      "declKind": "Func",
+      "usr": "s:4cake4foo3yys10DictionaryVySiSSGF",
+      "location": "",
+      "moduleName": "cake",
+      "children": [
+        {
+          "kind": "TypeNominal",
+          "name": "Void",
+          "printedName": "()"
+        },
+        {
+          "kind": "TypeNominal",
+          "name": "Dictionary",
+          "printedName": "[Int : String]",
+          "usr": "s:s10DictionaryV",
+          "children": [
+            {
+              "kind": "TypeNominal",
+              "name": "Int",
+              "printedName": "Int",
+              "usr": "s:Si"
+            },
+            {
+              "kind": "TypeNominal",
+              "name": "String",
+              "printedName": "String",
+              "usr": "s:SS"
+            }
+          ]
         }
       ]
     },
@@ -447,7 +496,8 @@
                 {
                   "kind": "TypeNominal",
                   "name": "Number",
-                  "printedName": "Number"
+                  "printedName": "Number",
+                  "usr": "s:4cake6NumberO"
                 },
                 {
                   "kind": "TypeNominal",
@@ -457,7 +507,8 @@
                     {
                       "kind": "TypeNominal",
                       "name": "Number",
-                      "printedName": "Number"
+                      "printedName": "Number",
+                      "usr": "s:4cake6NumberO"
                     }
                   ]
                 }
@@ -477,7 +528,8 @@
             {
               "kind": "TypeNominal",
               "name": "Int",
-              "printedName": "Int"
+              "printedName": "Int",
+              "usr": "s:Si"
             }
           ]
         },
@@ -493,7 +545,8 @@
             {
               "kind": "TypeNominal",
               "name": "Int",
-              "printedName": "Int"
+              "printedName": "Int",
+              "usr": "s:Si"
             },
             {
               "kind": "Getter",
@@ -507,7 +560,8 @@
                 {
                   "kind": "TypeNominal",
                   "name": "Int",
-                  "printedName": "Int"
+                  "printedName": "Int",
+                  "usr": "s:Si"
                 }
               ]
             }
@@ -526,18 +580,21 @@
               "kind": "TypeNominal",
               "name": "Optional",
               "printedName": "Number?",
+              "usr": "s:Sq",
               "children": [
                 {
                   "kind": "TypeNominal",
                   "name": "Number",
-                  "printedName": "Number"
+                  "printedName": "Number",
+                  "usr": "s:4cake6NumberO"
                 }
               ]
             },
             {
               "kind": "TypeNominal",
               "name": "Int",
-              "printedName": "Int"
+              "printedName": "Int",
+              "usr": "s:Si"
             }
           ]
         },
@@ -553,7 +610,8 @@
             {
               "kind": "TypeNominal",
               "name": "Int",
-              "printedName": "Int"
+              "printedName": "Int",
+              "usr": "s:Si"
             },
             {
               "kind": "Getter",
@@ -567,7 +625,8 @@
                 {
                   "kind": "TypeNominal",
                   "name": "Int",
-                  "printedName": "Int"
+                  "printedName": "Int",
+                  "usr": "s:Si"
                 }
               ]
             }
diff --git a/test/api-digester/apinotes-diags.swift b/test/api-digester/apinotes-diags.swift
@@ -2,7 +2,7 @@
 // RUN: %empty-directory(%t.mod)
 // RUN: %empty-directory(%t.sdk)
 // RUN: %empty-directory(%t.module-cache)
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesLeft
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesRight
+// RUN: %api-digester %clang-importer-sdk-nosource -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache -swift-version 3 -I %S/Inputs/APINotesLeft
+// RUN: %api-digester %clang-importer-sdk-nosource -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache -swift-version 3 -I %S/Inputs/APINotesRight
 // RUN: %api-digester -diagnose-sdk -print-module -input-paths %t.dump1.json -input-paths %t.dump2.json > %t.result
 // RUN: diff -u %S/Outputs/apinotes-diags.txt %t.result
diff --git a/test/api-digester/apinotes-migrator-gen.swift b/test/api-digester/apinotes-migrator-gen.swift
@@ -2,7 +2,7 @@
 // RUN: %empty-directory(%t.mod)
 // RUN: %empty-directory(%t.sdk)
 // RUN: %empty-directory(%t.module-cache)
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesLeft
-// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %S/Inputs/APINotesRight
+// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump1.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %S/Inputs/APINotesLeft
+// RUN: %api-digester -dump-sdk -module APINotesTest -o %t.dump2.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %S/Inputs/APINotesRight
 // RUN: %api-digester -compare-sdk --input-paths %t.dump1.json -input-paths %t.dump2.json -o %t.result -json
 // RUN: diff -u %S/Outputs/apinotes-migrator-gen.json %t.result
diff --git a/test/api-digester/compare-dump.swift b/test/api-digester/compare-dump.swift
@@ -1,9 +1,9 @@
 // RUN: %empty-directory(%t.mod)
 // RUN: %empty-directory(%t.sdk)
 // RUN: %empty-directory(%t.module-cache)
-// RUN: %swift -emit-module -o %t.mod/cake1.swiftmodule %S/Inputs/cake1.swift -parse-as-library -I %S/Inputs/APINotesLeft
-// RUN: %swift -emit-module -o %t.mod/cake2.swiftmodule %S/Inputs/cake2.swift -parse-as-library -I %S/Inputs/APINotesRight
-// RUN: %api-digester -dump-sdk -module cake1 -o %t.dump1.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %t.mod -I %S/Inputs/APINotesLeft
-// RUN: %api-digester -dump-sdk -module cake2 -o %t.dump2.json -module-cache-path %t.module-cache -sdk %t.sdk -swift-version 3 -I %t.mod -I %S/Inputs/APINotesRight
+// RUN: %swift -emit-module -o %t.mod/cake1.swiftmodule %S/Inputs/cake1.swift -parse-as-library -I %S/Inputs/APINotesLeft %clang-importer-sdk-nosource
+// RUN: %swift -emit-module -o %t.mod/cake2.swiftmodule %S/Inputs/cake2.swift -parse-as-library -I %S/Inputs/APINotesRight %clang-importer-sdk-nosource
+// RUN: %api-digester -dump-sdk -module cake1 -o %t.dump1.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %t.mod -I %S/Inputs/APINotesLeft
+// RUN: %api-digester -dump-sdk -module cake2 -o %t.dump2.json -module-cache-path %t.module-cache %clang-importer-sdk-nosource -swift-version 3 -I %t.mod -I %S/Inputs/APINotesRight
 // RUN: %api-digester -diagnose-sdk -print-module --input-paths %t.dump1.json -input-paths %t.dump2.json > %t.result
 // RUN: diff -u %S/Outputs/Cake.txt %t.result
diff --git a/tools/swift-api-digester/swift-api-digester.cpp b/tools/swift-api-digester/swift-api-digester.cpp
@@ -511,9 +511,12 @@ bool SDKNodeType::classof(const SDKNode *N) {
 }
 
 class SDKNodeTypeNominal : public SDKNodeType {
+  StringRef USR;
 public:
   SDKNodeTypeNominal(SDKNodeInitInfo Info) : SDKNodeType(Info,
-    SDKNodeKind::TypeNominal) {}
+    SDKNodeKind::TypeNominal), USR(Info.USR) {}
+  // Get the usr of the correspoding nominal type decl.
+  StringRef getUsr() const { return USR; }
   static bool classof(const SDKNode *N);
 };
 
@@ -1286,6 +1289,10 @@ SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, Type Ty,
     TypeInfo(TypeInfo) {
   if (isFunctionTypeNoEscape(Ty))
     TypeAttrs.push_back(TypeAttrKind::TAK_noescape);
+  // If this is a nominal type, get its Usr.
+  if (auto *ND = Ty->getAnyNominal()) {
+    USR = calculateUsr(Ctx, ND);
+  }
 }
 
 SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD)
@@ -1760,6 +1767,12 @@ namespace swift {
             out.mapRequired(getKeyContent(Ctx, KeyKind::KK_hasDefaultArg).data(),
                             HasDefault);
           }
+          // Serialize nominal type's USR.
+          if (auto NT = dyn_cast<SDKNodeTypeNominal>(value)) {
+            auto Usr = NT->getUsr();
+            if (!Usr.empty())
+              out.mapRequired(getKeyContent(Ctx, KeyKind::KK_usr).data(), Usr);
+          }
         }
         if (!value->isLeaf()) {
           ArrayRef<SDKNode *> Children = value->getChildren();
@@ -3424,7 +3437,7 @@ static int compareSDKs(StringRef LeftPath, StringRef RightPath,
 
   llvm::errs() << "Dumping diff to " << DiffPath << '\n';
   std::vector<OverloadedFuncInfo> Overloads;
-  OverloadMemberFunctionEmitter::collectDiffItems(RightModule, Overloads);
+  // OverloadMemberFunctionEmitter::collectDiffItems(RightModule, Overloads);
 
   std::error_code EC;
   llvm::raw_fd_ostream Fs(DiffPath, EC, llvm::sys::fs::F_None);

Original file line number	Diff line number	Diff line change
`@@ -35,3 +35,5 @@ public func foo2(_ a: Int = #line, b: S1) {}`
`35`	`35`	`public enum Number: Int {`
`36`	`36`	`case one`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+public func foo3(_ a: [Int: String]) {}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@`
`43`	`43`	`"kind": "TypeNominal",`
`44`	`44`	`"name": "C0",`
`45`	`45`	`"printedName": "C0<T1, T2, T3>",`
	`46`	`+ "usr": "s:4cake2C0C",`
`46`	`47`	`"children": [`
`47`	`48`	`{`
`48`	`49`	`"kind": "TypeNominal",`
`@@ -188,7 +189,8 @@`
`188`	`189`	`{`
`189`	`190`	`"kind": "TypeNominal",`
`190`	`191`	`"name": "S1",`
`191`		`- "printedName": "S1"`
	`192`	`+ "printedName": "S1",`
	`193`	`+ "usr": "s:4cake2S1V"`
`192`	`194`	`}`
`193`	`195`	`]`
`194`	`196`	`}`
`@@ -249,11 +251,13 @@`
`249`	`251`	`"kind": "TypeNominal",`
`250`	`252`	`"name": "Optional",`
`251`	`253`	`"printedName": "C1?",`
	`254`	`+ "usr": "s:Sq",`
`252`	`255`	`"children": [`
`253`	`256`	`{`
`254`	`257`	`"kind": "TypeNominal",`
`255`	`258`	`"name": "C1",`
`256`		`- "printedName": "C1"`
	`259`	`+ "printedName": "C1",`
	`260`	`+ "usr": "s:4cake2C1C"`
`257`	`261`	`}`
`258`	`262`	`]`
`259`	`263`	`}`
`@@ -277,11 +281,13 @@`
`277`	`281`	`"kind": "TypeNominal",`
`278`	`282`	`"name": "Optional",`
`279`	`283`	`"printedName": "C1?",`
	`284`	`+ "usr": "s:Sq",`
`280`	`285`	`"children": [`
`281`	`286`	`{`
`282`	`287`	`"kind": "TypeNominal",`
`283`	`288`	`"name": "C1",`
`284`		`- "printedName": "C1"`
	`289`	`+ "printedName": "C1",`
	`290`	`+ "usr": "s:4cake2C1C"`
`285`	`291`	`}`
`286`	`292`	`]`
`287`	`293`	`}`
`@@ -316,7 +322,8 @@`
`316`	`322`	`{`
`317`	`323`	`"kind": "TypeNominal",`
`318`	`324`	`"name": "C1",`
`319`		`- "printedName": "C1"`
	`325`	`+ "printedName": "C1",`
	`326`	`+ "usr": "s:4cake2C1C"`
`320`	`327`	`}`
`321`	`328`	`]`
`322`	`329`	`},`
`@@ -337,7 +344,8 @@`
`337`	`344`	`{`
`338`	`345`	`"kind": "TypeNominal",`
`339`	`346`	`"name": "C1",`
`340`		`- "printedName": "C1"`
	`347`	`+ "printedName": "C1",`
	`348`	`+ "usr": "s:4cake2C1C"`
`341`	`349`	`}`
`342`	`350`	`]`
`343`	`351`	`}`
`@@ -355,7 +363,8 @@`
`355`	`363`	`{`
`356`	`364`	`"kind": "TypeNominal",`
`357`	`365`	`"name": "C1",`
`358`		`- "printedName": "C1"`
	`366`	`+ "printedName": "C1",`
	`367`	`+ "usr": "s:4cake2C1C"`
`359`	`368`	`}`
`360`	`369`	`]`
`361`	`370`	`}`
`@@ -379,12 +388,14 @@`
`379`	`388`	`"kind": "TypeNominal",`
`380`	`389`	`"name": "Int",`
`381`	`390`	`"printedName": "Int",`
`382`		`- "hasDefaultArg": true`
	`391`	`+ "hasDefaultArg": true,`
	`392`	`+ "usr": "s:Si"`
`383`	`393`	`},`
`384`	`394`	`{`
`385`	`395`	`"kind": "TypeNominal",`
`386`	`396`	`"name": "S1",`
`387`		`- "printedName": "S1"`
	`397`	`+ "printedName": "S1",`
	`398`	`+ "usr": "s:4cake2S1V"`
`388`	`399`	`}`
`389`	`400`	`]`
`390`	`401`	`},`
`@@ -406,12 +417,50 @@`
`406`	`417`	`"kind": "TypeNominal",`
`407`	`418`	`"name": "Int",`
`408`	`419`	`"printedName": "Int",`
`409`		`- "hasDefaultArg": true`
	`420`	`+ "hasDefaultArg": true,`
	`421`	`+ "usr": "s:Si"`
`410`	`422`	`},`
`411`	`423`	`{`
`412`	`424`	`"kind": "TypeNominal",`
`413`	`425`	`"name": "S1",`
`414`		`- "printedName": "S1"`
	`426`	`+ "printedName": "S1",`
	`427`	`+ "usr": "s:4cake2S1V"`
	`428`	`+ }`
	`429`	`+ ]`
	`430`	`+ },`
	`431`	`+ {`
	`432`	`+ "kind": "Function",`
	`433`	`+ "name": "foo3",`
	`434`	`+ "printedName": "foo3(_:)",`
	`435`	`+ "declKind": "Func",`
	`436`	`+ "usr": "s:4cake4foo3yys10DictionaryVySiSSGF",`
	`437`	`+ "location": "",`
	`438`	`+ "moduleName": "cake",`
	`439`	`+ "children": [`
	`440`	`+ {`
	`441`	`+ "kind": "TypeNominal",`
	`442`	`+ "name": "Void",`
	`443`	`+ "printedName": "()"`
	`444`	`+ },`
	`445`	`+ {`
	`446`	`+ "kind": "TypeNominal",`
	`447`	`+ "name": "Dictionary",`
	`448`	`+ "printedName": "[Int : String]",`
	`449`	`+ "usr": "s:s10DictionaryV",`
	`450`	`+ "children": [`
	`451`	`+ {`
	`452`	`+ "kind": "TypeNominal",`
	`453`	`+ "name": "Int",`
	`454`	`+ "printedName": "Int",`
	`455`	`+ "usr": "s:Si"`
	`456`	`+ },`
	`457`	`+ {`
	`458`	`+ "kind": "TypeNominal",`
	`459`	`+ "name": "String",`
	`460`	`+ "printedName": "String",`
	`461`	`+ "usr": "s:SS"`
	`462`	`+ }`
	`463`	`+ ]`
`415`	`464`	`}`
`416`	`465`	`]`
`417`	`466`	`},`
`@@ -447,7 +496,8 @@`
`447`	`496`	`{`
`448`	`497`	`"kind": "TypeNominal",`
`449`	`498`	`"name": "Number",`
`450`		`- "printedName": "Number"`
	`499`	`+ "printedName": "Number",`
	`500`	`+ "usr": "s:4cake6NumberO"`
`451`	`501`	`},`
`452`	`502`	`{`
`453`	`503`	`"kind": "TypeNominal",`
`@@ -457,7 +507,8 @@`
`457`	`507`	`{`
`458`	`508`	`"kind": "TypeNominal",`
`459`	`509`	`"name": "Number",`
`460`		`- "printedName": "Number"`
	`510`	`+ "printedName": "Number",`
	`511`	`+ "usr": "s:4cake6NumberO"`
`461`	`512`	`}`
`462`	`513`	`]`
`463`	`514`	`}`
`@@ -477,7 +528,8 @@`
`477`	`528`	`{`
`478`	`529`	`"kind": "TypeNominal",`
`479`	`530`	`"name": "Int",`
`480`		`- "printedName": "Int"`
	`531`	`+ "printedName": "Int",`
	`532`	`+ "usr": "s:Si"`
`481`	`533`	`}`
`482`	`534`	`]`
`483`	`535`	`},`
`@@ -493,7 +545,8 @@`
`493`	`545`	`{`
`494`	`546`	`"kind": "TypeNominal",`
`495`	`547`	`"name": "Int",`
`496`		`- "printedName": "Int"`
	`548`	`+ "printedName": "Int",`
	`549`	`+ "usr": "s:Si"`
`497`	`550`	`},`
`498`	`551`	`{`
`499`	`552`	`"kind": "Getter",`
`@@ -507,7 +560,8 @@`
`507`	`560`	`{`
`508`	`561`	`"kind": "TypeNominal",`
`509`	`562`	`"name": "Int",`
`510`		`- "printedName": "Int"`
	`563`	`+ "printedName": "Int",`
	`564`	`+ "usr": "s:Si"`
`511`	`565`	`}`
`512`	`566`	`]`
`513`	`567`	`}`
`@@ -526,18 +580,21 @@`
`526`	`580`	`"kind": "TypeNominal",`
`527`	`581`	`"name": "Optional",`
`528`	`582`	`"printedName": "Number?",`
	`583`	`+ "usr": "s:Sq",`
`529`	`584`	`"children": [`
`530`	`585`	`{`
`531`	`586`	`"kind": "TypeNominal",`
`532`	`587`	`"name": "Number",`
`533`		`- "printedName": "Number"`
	`588`	`+ "printedName": "Number",`
	`589`	`+ "usr": "s:4cake6NumberO"`
`534`	`590`	`}`
`535`	`591`	`]`
`536`	`592`	`},`
`537`	`593`	`{`
`538`	`594`	`"kind": "TypeNominal",`
`539`	`595`	`"name": "Int",`
`540`		`- "printedName": "Int"`
	`596`	`+ "printedName": "Int",`
	`597`	`+ "usr": "s:Si"`
`541`	`598`	`}`
`542`	`599`	`]`
`543`	`600`	`},`
`@@ -553,7 +610,8 @@`
`553`	`610`	`{`
`554`	`611`	`"kind": "TypeNominal",`
`555`	`612`	`"name": "Int",`
`556`		`- "printedName": "Int"`
	`613`	`+ "printedName": "Int",`
	`614`	`+ "usr": "s:Si"`
`557`	`615`	`},`
`558`	`616`	`{`
`559`	`617`	`"kind": "Getter",`
`@@ -567,7 +625,8 @@`
`567`	`625`	`{`
`568`	`626`	`"kind": "TypeNominal",`
`569`	`627`	`"name": "Int",`
`570`		`- "printedName": "Int"`
	`628`	`+ "printedName": "Int",`
	`629`	`+ "usr": "s:Si"`
`571`	`630`	`}`
`572`	`631`	`]`
`573`	`632`	`}`