Merge pull request #41825 from artemcm/SwiftStaticMirrr/MangledNamesNoPrefix

[Swift Static Mirror] Report mangled names without a prefix

Author: artemcm

include/swift/Reflection/TypeRefBuilder.h

@@ -1359,8 +1359,7 @@ class TypeRefBuilder {
         auto TypeName = nodeToString(demangleTypeRef(TypeRef));
         clearNodeFactory();
         if (OptionalMangledTypeName.hasValue()) {
-          typeNameToManglingMap[TypeName] =
-              "$s" + OptionalMangledTypeName.getValue();
+          typeNameToManglingMap[TypeName] = OptionalMangledTypeName.getValue();
         }
       }
     }

stdlib/public/Reflection/TypeRefBuilder.cpp

@@ -443,7 +443,7 @@ FieldTypeCollectionResult TypeRefBuilder::collectFieldTypes(
       clearNodeFactory();
       if (optionalMangledTypeName.hasValue()) {
         auto mangledTypeName =
-            optionalMangledTypeName.getValue().insert(0, "$s");
+          optionalMangledTypeName.getValue();
         if (forMangledTypeName.hasValue()) {
           if (mangledTypeName != forMangledTypeName.getValue())
             continue;
@@ -461,8 +461,7 @@ FieldTypeCollectionResult TypeRefBuilder::collectFieldTypes(
             auto optionalMangledfieldTypeName =
                 normalizeReflectionName(fieldTypeRef);
             if (optionalMangledfieldTypeName.hasValue()) {
-              mangledFieldTypeName =
-                  "$s" + optionalMangledfieldTypeName.getValue();
+              mangledFieldTypeName = optionalMangledfieldTypeName.getValue();
             }
             auto fieldTypeDemangleTree = demangleTypeRef(fieldTypeRef);
             auto fieldTypeName = nodeToString(fieldTypeDemangleTree);
@@ -518,7 +517,7 @@ AssociatedTypeCollectionResult TypeRefBuilder::collectAssociatedTypes(
       clearNodeFactory();
       if (optionalMangledTypeName.hasValue()) {
         auto mangledTypeName =
-            optionalMangledTypeName.getValue().insert(0, "$s");
+            optionalMangledTypeName.getValue();
         if (forMangledTypeName.hasValue()) {
           if (mangledTypeName != forMangledTypeName.getValue())
             continue;
@@ -538,8 +537,7 @@ AssociatedTypeCollectionResult TypeRefBuilder::collectAssociatedTypes(
           auto optionalMangledSubstitutedTypeName =
               normalizeReflectionName(substitutedTypeRef);
           if (optionalMangledSubstitutedTypeName.hasValue()) {
-            mangledSubstitutedTypeName =
-                "$s" + optionalMangledSubstitutedTypeName.getValue();
+            mangledSubstitutedTypeName = optionalMangledSubstitutedTypeName.getValue();
           }
           auto substitutedDemangleTree = demangleTypeRef(substitutedTypeRef);
           auto substitutedTypeName = nodeToString(substitutedDemangleTree);

test/Reflection/conformance_descriptors.swift

@@ -13,9 +13,9 @@
 
 // CHECK: CONFORMANCES:
 // CHECK: =============
-// CHECK-DAG: $s16ConformanceCheck3fooV3barV3bazV3quxV4quuxV5corgeV6graultV6garplyV5waldoV4fredV5plughV5xyzzyV4thudV18SomeConformingTypeV (ConformanceCheck.foo.bar.baz.qux.quux.corge.grault.garply.waldo.fred.plugh.xyzzy.thud.SomeConformingType) : ConformanceCheck.MyProto
-// CHECK-DAG: $s16ConformanceCheck7StructAV (ConformanceCheck.StructA) : ConformanceCheck.MyProto, Swift.Hashable, Swift.Equatable
-// CHECK-DAG: $s16ConformanceCheck2E4O (ConformanceCheck.E4) : ConformanceCheck.P1, ConformanceCheck.P2, ConformanceCheck.P3
-// CHECK-DAG: $s16ConformanceCheck2C4V (ConformanceCheck.C4) : ConformanceCheck.P1, ConformanceCheck.P2
-// CHECK-DAG: $s16ConformanceCheck2S4V (ConformanceCheck.S4) : ConformanceCheck.P1, ConformanceCheck.P2
-// CHECK-DAG: $s16ConformanceCheck2C1C (ConformanceCheck.C1) : ConformanceCheck.ClassBoundP
+// CHECK-DAG: 16ConformanceCheck3fooV3barV3bazV3quxV4quuxV5corgeV6graultV6garplyV5waldoV4fredV5plughV5xyzzyV4thudV18SomeConformingTypeV (ConformanceCheck.foo.bar.baz.qux.quux.corge.grault.garply.waldo.fred.plugh.xyzzy.thud.SomeConformingType) : ConformanceCheck.MyProto
+// CHECK-DAG: 16ConformanceCheck7StructAV (ConformanceCheck.StructA) : ConformanceCheck.MyProto, Swift.Hashable, Swift.Equatable
+// CHECK-DAG: 16ConformanceCheck2E4O (ConformanceCheck.E4) : ConformanceCheck.P1, ConformanceCheck.P2, ConformanceCheck.P3
+// CHECK-DAG: 16ConformanceCheck2C4V (ConformanceCheck.C4) : ConformanceCheck.P1, ConformanceCheck.P2
+// CHECK-DAG: 16ConformanceCheck2S4V (ConformanceCheck.S4) : ConformanceCheck.P1, ConformanceCheck.P2
+// CHECK-DAG: 16ConformanceCheck2C1C (ConformanceCheck.C1) : ConformanceCheck.ClassBoundP