Merge pull request #64148 from artemcm/ConstExtractMangledTypeValue

[Compile Time Constant Extraction] Extract mangled names for Type values

Author: artemcm

lib/ConstExtract/ConstExtract.cpp

@@ -12,6 +12,7 @@
 
 #include "swift/ConstExtract/ConstExtract.h"
 #include "swift/AST/ASTContext.h"
+#include "swift/AST/ASTMangler.h"
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticEngine.h"
@@ -75,6 +76,10 @@ std::string toFullyQualifiedTypeNameString(const swift::Type &Type) {
   return TypeNameOutput;
 }
 
+std::string toMangledTypeNameString(const swift::Type &Type) {
+  return Mangle::ASTMangler().mangleTypeWithoutPrefix(Type);
+}
+
 } // namespace
 
 namespace swift {
@@ -623,10 +628,13 @@ void writeValue(llvm::json::OStream &JSON,
 
   case CompileTimeValue::ValueKind::Type: {
     auto typeValue = cast<TypeValue>(value);
+    Type type = typeValue->getType();
     JSON.attribute("valueKind", "Type");
     JSON.attributeObject("value", [&]() {
       JSON.attribute("type",
-                     toFullyQualifiedTypeNameString(typeValue->getType()));
+                     toFullyQualifiedTypeNameString(type));
+      JSON.attribute("mangledName",
+                     toMangledTypeNameString(type));
     });
     break;
   }

test/ConstExtraction/ExtractTypeValue.swift

@@ -0,0 +1,47 @@
+// RUN: %empty-directory(%t)
+// RUN: echo "[MyProto]" > %t/protocols.json
+
+// RUN: %target-swift-frontend -typecheck -emit-const-values-path %t/ExtractLiterals.swiftconstvalues -const-gather-protocols-file %t/protocols.json -primary-file %s
+// RUN: cat %t/ExtractLiterals.swiftconstvalues 2>&1 | %FileCheck %s
+
+protocol MyProto {}
+
+protocol Bird {}
+struct Warbler<T> : Bird {}
+struct Avocet : Bird {}
+struct RainbowLorikeet : Bird {}
+
+struct TypeValuePropertyStruct : MyProto {
+    var birdTypes: [any Bird.Type] = [Warbler<String>.self, Avocet.self, RainbowLorikeet.self]
+}
+
+// CHECK:             "label": "birdTypes",
+// CHECK-NEXT:        "type": "Swift.Array<ExtractTypeValue.Bird.Type>",
+// CHECK-NEXT:        "isStatic": "false",
+// CHECK-NEXT:        "isComputed": "false",
+// CHECK-NEXT:        "file": "{{.*}}ExtractTypeValue.swift",
+// CHECK-NEXT:        "line": 15,
+// CHECK-NEXT:        "valueKind": "Array",
+// CHECK-NEXT:        "value": [
+// CHECK-NEXT:          {
+// CHECK-NEXT:            "valueKind": "Type",
+// CHECK-NEXT:            "value": {
+// CHECK-NEXT:              "type": "ExtractTypeValue.Warbler<Swift.String>.Type",
+// CHECK-NEXT:              "mangledName": "16ExtractTypeValue7WarblerVySSGm"
+// CHECK-NEXT:            }
+// CHECK-NEXT:          },
+// CHECK-NEXT:          {
+// CHECK-NEXT:            "valueKind": "Type",
+// CHECK-NEXT:            "value": {
+// CHECK-NEXT:              "type": "ExtractTypeValue.Avocet.Type",
+// CHECK-NEXT:              "mangledName": "16ExtractTypeValue6AvocetVm"
+// CHECK-NEXT:            }
+// CHECK-NEXT:          },
+// CHECK-NEXT:          {
+// CHECK-NEXT:            "valueKind": "Type",
+// CHECK-NEXT:            "value": {
+// CHECK-NEXT:              "type": "ExtractTypeValue.RainbowLorikeet.Type",
+// CHECK-NEXT:              "mangledName": "16ExtractTypeValue15RainbowLorikeetVm"
+// CHECK-NEXT:            }
+// CHECK-NEXT:          }
+// CHECK-NEXT:        ]

test/ConstExtraction/ExtractTypes.swift

@@ -27,18 +27,21 @@ public struct Types : MyProto {
 // CHECK-NEXT:      "valueKind": "Type",
 // CHECK-NEXT:      "value": {
 // CHECK-NEXT:        "type": "ExtractTypes.TypeA.Type"
+// CHECK-NEXT:        "mangledName": "12ExtractTypes5TypeAVm"
 // CHECK-NEXT:      }
 // CHECK-NEXT:    },
 // CHECK-NEXT:    {
 // CHECK-NEXT:      "valueKind": "Type",
 // CHECK-NEXT:      "value": {
 // CHECK-NEXT:        "type": "ExtractTypes.TypeB.Type"
+// CHECK-NEXT:        "mangledName": "12ExtractTypes5TypeBOm"
 // CHECK-NEXT:      }
 // CHECK-NEXT:    },
 // CHECK-NEXT:    {
 // CHECK-NEXT:      "valueKind": "Type",
 // CHECK-NEXT:      "value": {
 // CHECK-NEXT:        "type": "ExtractTypes.TypeC.Type"
+// CHECK-NEXT:        "mangledName": "12ExtractTypes5TypeCCm"
 // CHECK-NEXT:      }
 // CHECK-NEXT:    }
 // CHECK-NEXT:  ]