Merge pull request #67696 from artemcm/59ConstExtractPrintTypesOutOfContext

[5.9 🍒][Compile Time Constant Extraction] Map types with archetypes out of context, before mangling them for printing.

Author: artemcm

lib/ConstExtract/ConstExtract.cpp

@@ -85,7 +85,10 @@ std::string toFullyQualifiedProtocolNameString(const swift::ProtocolDecl &Protoc
 }
 
 std::string toMangledTypeNameString(const swift::Type &Type) {
-  return Mangle::ASTMangler().mangleTypeWithoutPrefix(Type->getCanonicalType());
+  auto PrintingType = Type;
+  if (Type->hasArchetype())
+    PrintingType = Type->mapTypeOutOfContext();
+  return Mangle::ASTMangler().mangleTypeWithoutPrefix(PrintingType->getCanonicalType());
 }
 
 } // namespace

test/ConstExtraction/ExtractArchetype.swift

@@ -0,0 +1,36 @@
+// RUN: %empty-directory(%t)
+// RUN: echo "[MyProto]" > %t/protocols.json
+
+// RUN: %target-swift-frontend -typecheck -emit-const-values-path %t/ExtractEnums.swiftconstvalues -const-gather-protocols-file %t/protocols.json -primary-file %s
+// RUN: cat %t/ExtractEnums.swiftconstvalues 2>&1 | %FileCheck %s
+
+protocol MyProto {}
+
+public struct Foo {
+    init(bar: Any) {
+    }
+}
+
+public struct ArchetypalConformance<T>: MyProto {
+    let baz: Foo = Foo(bar: T.self)
+    public init() {}
+}
+
+// CHECK: [
+// CHECK-NEXT:  {
+// CHECK-NEXT:    "typeName": "ExtractArchetype.ArchetypalConformance<T>"
+// CHECK:        "valueKind": "InitCall",
+// CHECK-NEXT:        "value": {
+// CHECK-NEXT:          "type": "ExtractArchetype.Foo",
+// CHECK-NEXT:          "arguments": [
+// CHECK-NEXT:            {
+// CHECK-NEXT:              "label": "bar",
+// CHECK-NEXT:              "type": "Any",
+// CHECK-NEXT:              "valueKind": "Type",
+// CHECK-NEXT:              "value": {
+// CHECK-NEXT:                "type": "T",
+// CHECK-NEXT:                "mangledName": "x"
+// CHECK-NEXT:              }
+// CHECK-NEXT:            }
+// CHECK-NEXT:          ]
+// CHECK-NEXT:        }