Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix name mangling for CoreLib #102183

Merged
merged 1 commit into from
May 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
Expand Down