-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Optimize away GVM resolution metadata #118632
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GVMMetadataNode.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Diagnostics; | ||
| using System.Collections.Generic; | ||
|
|
||
| using ILCompiler.DependencyAnalysisFramework; | ||
| using Internal.TypeSystem; | ||
|
|
||
| namespace ILCompiler.DependencyAnalysis | ||
| { | ||
| internal sealed class GVMMetadataNode : SortableDependencyNode | ||
| { | ||
| public MethodDesc CallingMethod { get; } | ||
| public MethodDesc ImplementationMethod { get; } | ||
| public GVMMetadataNode(MethodDesc callingMethod, MethodDesc implementationMethod) | ||
| => (CallingMethod, ImplementationMethod) = (callingMethod, implementationMethod); | ||
|
|
||
| protected override string GetName(NodeFactory context) => | ||
| $"GVM method: {CallingMethod}: {ImplementationMethod}"; | ||
|
|
||
| public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFactory factory) | ||
| { | ||
| var list = new DependencyList(); | ||
| GenericVirtualMethodTableNode.GetGenericVirtualMethodImplementationDependencies(ref list, factory, CallingMethod, ImplementationMethod); | ||
| return list; | ||
| } | ||
|
|
||
| public override int ClassCode => 0x2898423; | ||
|
|
||
| public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) | ||
| { | ||
| var otherNode = (GVMMetadataNode)other; | ||
|
|
||
| int result = comparer.Compare(CallingMethod, otherNode.CallingMethod); | ||
| if (result != 0) | ||
| return result; | ||
|
|
||
| return comparer.Compare(ImplementationMethod, otherNode.ImplementationMethod); | ||
| } | ||
|
|
||
| public override bool InterestingForDynamicDependencyAnalysis => false; | ||
| public override bool HasDynamicDependencies => false; | ||
| public override bool HasConditionalStaticDependencies => false; | ||
| public override bool StaticDependenciesAreComputed => true; | ||
| public override IEnumerable<CombinedDependencyListEntry> GetConditionalStaticDependencies(NodeFactory context) => null; | ||
| public override IEnumerable<CombinedDependencyListEntry> SearchDynamicDependencies(List<DependencyNodeCore<NodeFactory>> markedNodes, int firstNode, NodeFactory context) => null; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...clr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceGVMMetadataNode.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Diagnostics; | ||
| using System.Collections.Generic; | ||
|
|
||
| using ILCompiler.DependencyAnalysisFramework; | ||
| using Internal.TypeSystem; | ||
|
|
||
| namespace ILCompiler.DependencyAnalysis | ||
| { | ||
| internal sealed class InterfaceGVMMetadataNode : SortableDependencyNode | ||
| { | ||
| public MethodDesc CallingMethod { get; } | ||
| public MethodDesc ImplementationMethod { get; } | ||
| public TypeDesc ImplementationType { get; } | ||
| public DefaultInterfaceMethodResolution DefaultResolution { get; } | ||
|
|
||
| public InterfaceGVMMetadataNode(MethodDesc callingMethod, MethodDesc implementationMethod, | ||
| TypeDesc implementationType, DefaultInterfaceMethodResolution defaultResolution) | ||
| => (CallingMethod, ImplementationMethod, ImplementationType, DefaultResolution) | ||
| = (callingMethod, implementationMethod, implementationType, defaultResolution); | ||
|
|
||
| protected override string GetName(NodeFactory context) => | ||
| $"GVM interface method: {CallingMethod} on {ImplementationType}: {ImplementationMethod}, {DefaultResolution}"; | ||
|
|
||
| public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFactory factory) | ||
| { | ||
| var list = new DependencyList(); | ||
| InterfaceGenericVirtualMethodTableNode.GetGenericVirtualMethodImplementationDependencies(ref list, factory, CallingMethod, ImplementationType, ImplementationMethod); | ||
| return list; | ||
| } | ||
|
|
||
| public override int ClassCode => 0x48bcaa1; | ||
|
|
||
| public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) | ||
| { | ||
| var otherNode = (InterfaceGVMMetadataNode)other; | ||
|
|
||
| int result = comparer.Compare(ImplementationType, otherNode.ImplementationType); | ||
| if (result != 0) | ||
| return result; | ||
|
|
||
| DefType[] interfaceList = ImplementationType.RuntimeInterfaces; | ||
| int thisIndex = Array.IndexOf(interfaceList, CallingMethod.OwningType); | ||
| int thatIndex = Array.IndexOf(interfaceList, otherNode.CallingMethod.OwningType); | ||
|
|
||
| Debug.Assert(thisIndex >= 0 && thatIndex >= 0); | ||
|
|
||
| result = Comparer<int>.Default.Compare(thisIndex, thatIndex); | ||
| if (result != 0) | ||
| return result; | ||
|
|
||
| return comparer.Compare(ImplementationMethod, otherNode.ImplementationMethod); | ||
| } | ||
|
|
||
| public override bool InterestingForDynamicDependencyAnalysis => false; | ||
| public override bool HasDynamicDependencies => false; | ||
| public override bool HasConditionalStaticDependencies => false; | ||
| public override bool StaticDependenciesAreComputed => true; | ||
| public override IEnumerable<CombinedDependencyListEntry> GetConditionalStaticDependencies(NodeFactory context) => null; | ||
| public override IEnumerable<CombinedDependencyListEntry> SearchDynamicDependencies(List<DependencyNodeCore<NodeFactory>> markedNodes, int firstNode, NodeFactory context) => null; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Equals method for InterfaceGVMMetadataKey is incomplete. It only compares CallingMethod and ImplementationType, but ignores ImplementationMethod and DefaultResolution fields. This could lead to incorrect equality comparisons and potential cache key collisions.
Copilot uses AI. Check for mistakes.