Fix name mangling for CoreLib (dotnet#102183)

dotnet#96983 broke name mangling within corelib - we were not prepending the assembly name and not replacing dots with underscores.
Ruihan-Yin · May 30, 2024 · 04056d4 · 04056d4
1 parent fb5a18a
commit 04056d4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs b/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs
@@ -202,6 +202,8 @@ private string ComputeMangledTypeName(TypeDesc type)
                                 containingType = containingType.ContainingType;
                             }
 
+                            name = prependAssemblyName + "_" + SanitizeName(name, true);
+
                             // If this is one of the well known types, use a shorter name
                             // We know this won't conflict because all the other types are
                             // prefixed by the assembly name.
@@ -231,10 +233,6 @@ private string ComputeMangledTypeName(TypeDesc type)
                                         break;
                                 }
                             }
-                            else
-                            {
-                                name = prependAssemblyName + "_" + SanitizeName(name, true);
-                            }
 
                             // Ensure that name is unique and update our tables accordingly.
                             name = DisambiguateName(name, deduplicator);