[Compile Time Constant Extraction] Print fully-qualified type names

Author: artemcm

lib/ConstExtract/ConstExtract.cpp

@@ -48,6 +48,17 @@ class NominalTypeConformanceCollector : public swift::ASTWalker {
   }
 };
 
+std::string toFullyQualifiedTypeNameString(const swift::Type &Type) {
+  std::string TypeNameOutput;
+  llvm::raw_string_ostream OutputStream(TypeNameOutput);
+  swift::PrintOptions Options;
+  Options.FullyQualifiedTypes = true;
+  Options.PreferTypeRepr = true;
+  Type.print(OutputStream, Options);
+  OutputStream.flush();
+  return TypeNameOutput;
+}
+
 } // namespace
 
 namespace swift {
@@ -171,7 +182,7 @@ gatherConstValuesForPrimary(const std::unordered_set<std::string> &Protocols,
   return Result;
 }
 
-static std::string toString(const CompileTimeValue *Value) {
+std::string toString(const CompileTimeValue *Value) {
   switch (Value->getKind()) {
     case CompileTimeValue::RawLiteral:
       return cast<RawLiteralValue>(Value)->getValue();
@@ -193,7 +204,7 @@ bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
     for (const auto &TypeInfo : ConstValueInfos) {
       JSON.object([&] {
         const auto *TypeDecl = TypeInfo.TypeDecl;
-        JSON.attribute("typeName", TypeDecl->getName().str().str());
+        JSON.attribute("typeName", toFullyQualifiedTypeNameString(TypeDecl->getDeclaredInterfaceType()));
         JSON.attribute(
             "kind",
             TypeDecl->getDescriptiveKindName(TypeDecl->getDescriptiveKind())
@@ -203,7 +214,7 @@ bool writeAsJSONToFile(const std::vector<ConstValueTypeInfo> &ConstValueInfos,
             JSON.object([&] {
               const auto *PropertyDecl = PropertyInfo.VarDecl;
               JSON.attribute("label", PropertyDecl->getName().str().str());
-              JSON.attribute("type", PropertyDecl->getType().getString());
+              JSON.attribute("type", toFullyQualifiedTypeNameString(PropertyDecl->getType()));
               JSON.attribute("isStatic",
                              PropertyDecl->isStatic() ? "true" : "false");
               JSON.attribute("isComputed",

test/ConstExtraction/fields.swift

@@ -7,75 +7,75 @@
 // CHECK: [
 // CHECK-NEXT:
 // CHECK-NEXT:  {
-// CHECK-NEXT:    "typeName": "Foo",
+// CHECK-NEXT:    "typeName": "fields.Foo",
 // CHECK-NEXT:    "kind": "struct",
 // CHECK-NEXT:    "properties": [
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p1",
-// CHECK-NEXT:        "type": "String",
+// CHECK-NEXT:        "type": "Swift.String",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "Hello, World"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p5",
-// CHECK-NEXT:        "type": "[Int]",
+// CHECK-NEXT:        "type": "[Swift.Int]",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "[1, 2, 3, 4, 5, 6, 7, 8, 9]"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p6",
-// CHECK-NEXT:        "type": "Bool",
+// CHECK-NEXT:        "type": "Swift.Bool",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "false"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p7",
-// CHECK-NEXT:        "type": "Bool?",
+// CHECK-NEXT:        "type": "Swift.Bool?",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "nil"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p8",
-// CHECK-NEXT:        "type": "(Int, Float)",
+// CHECK-NEXT:        "type": "(Swift.Int, Swift.Float)",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "(42, 6.6)"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p9",
-// CHECK-NEXT:        "type": "[String : Int]",
+// CHECK-NEXT:        "type": "[Swift.String : Swift.Int]",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "[(\"One\", 1), (\"Two\", 2), (\"Three\", 3)]"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p0",
-// CHECK-NEXT:        "type": "Int",
+// CHECK-NEXT:        "type": "Swift.Int",
 // CHECK-NEXT:        "isStatic": "true",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "11"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p2",
-// CHECK-NEXT:        "type": "Float",
+// CHECK-NEXT:        "type": "Swift.Float",
 // CHECK-NEXT:        "isStatic": "true",
 // CHECK-NEXT:        "isComputed": "false",
 // CHECK-NEXT:        "value": "42.2"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p3",
-// CHECK-NEXT:        "type": "Int",
+// CHECK-NEXT:        "type": "Swift.Int",
 // CHECK-NEXT:        "isStatic": "false",
 // CHECK-NEXT:        "isComputed": "true",
 // CHECK-NEXT:        "value": "Unknown"
 // CHECK-NEXT:      },
 // CHECK-NEXT:      {
 // CHECK-NEXT:        "label": "p4",
-// CHECK-NEXT:        "type": "Int",
+// CHECK-NEXT:        "type": "Swift.Int",
 // CHECK-NEXT:        "isStatic": "true",
 // CHECK-NEXT:        "isComputed": "true",
 // CHECK-NEXT:        "value": "Unknown"