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.

Sign up for GitHub

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

Consider type declaration order in MethodImpls #111998

Merged
merged 1 commit into from
Feb 6, 2025
+55 −5
Merged

Consider type declaration order in MethodImpls #111998

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 55 additions & 5 deletions src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,22 +277,22 @@ private static bool IsInterfaceImplementedOnType(MetadataType type, MetadataType

private static MethodDesc FindImplFromDeclFromMethodImpls(MetadataType type, MethodDesc decl)
{
if (decl.OwningType.IsInterface)
return FindInterfaceImplFromDeclFromMethodImpls(type, decl);

MethodImplRecord[] foundMethodImpls = type.FindMethodsImplWithMatchingDeclName(decl.Name);

if (foundMethodImpls == null)
return null;

bool interfaceDecl = decl.OwningType.IsInterface;

foreach (MethodImplRecord record in foundMethodImpls)
{
MethodDesc recordDecl = record.Decl;

if (interfaceDecl != recordDecl.OwningType.IsInterface)
if (recordDecl.OwningType.IsInterface)
continue;

if (!interfaceDecl)
recordDecl = FindSlotDefiningMethodForVirtualMethod(recordDecl);
recordDecl = FindSlotDefiningMethodForVirtualMethod(recordDecl);

if (recordDecl == decl)
{
Expand All @@ -303,6 +303,56 @@ private static MethodDesc FindImplFromDeclFromMethodImpls(MetadataType type, Met
return null;
}

private static MethodDesc FindInterfaceImplFromDeclFromMethodImpls(MetadataType type, MethodDesc decl)
{
Debug.Assert(decl.OwningType.IsInterface);

MethodImplRecord[] foundMethodImpls = type.FindMethodsImplWithMatchingDeclName(decl.Name);

if (foundMethodImpls == null)
return null;

// We might find more than one result due to generic parameter folding
var results = new ArrayBuilder<int>(1);
for (int i = 0; i < foundMethodImpls.Length; i++)
{
MethodDesc recordDecl = foundMethodImpls[i].Decl;
if (recordDecl == decl)
{
results.Add(i);
}
}

if (results.Count == 0)
return null;

int resultIndex = results[0];

// If we found multiple MethodImpls, need to do a tie break using type declaration order
if (results.Count > 1)
{
MetadataType typeDefinition = (MetadataType)type.GetTypeDefinition();
DefType[] interfacesOnDefinition = typeDefinition.RuntimeInterfaces;
MethodImplRecord[] foundMethodImplsOnDefinition = typeDefinition.FindMethodsImplWithMatchingDeclName(decl.Name);
Debug.Assert(foundMethodImplsOnDefinition.Length == foundMethodImpls.Length);

int bestInterfaceIndex = int.MaxValue;

for (int i = 0; i < results.Count; i++)
{
int index = Array.IndexOf(interfacesOnDefinition, foundMethodImplsOnDefinition[results[i]].Decl.OwningType);
Debug.Assert(index >= 0);
if (index < bestInterfaceIndex)
{
bestInterfaceIndex = index;
resultIndex = i;
}
}
}

return FindSlotDefiningMethodForVirtualMethod(foundMethodImpls[resultIndex].Body);
}

private static bool IsInterfaceExplicitlyImplementedOnType(MetadataType type, MetadataType interfaceType)
{
foreach (TypeDesc iface in type.ExplicitlyImplementedInterfaces)
Expand Down
Loading