Skip to content

Make open method resolver pay for play #83064

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

Merged
jkotas merged 4 commits into from
Mar 7, 2023
Merged

Make open method resolver pay for play #83064

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2306c5a
Make open method resolver pay for play
MichalStrehovsky Mar 7, 2023
a3bc4a6
Update OpenMethodResolver.cs
MichalStrehovsky Mar 7, 2023
03f5cb2
Update OpenMethodResolver.cs
MichalStrehovsky Mar 7, 2023
d5091ed
Update OpenMethodResolver.cs
MichalStrehovsky Mar 7, 2023
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
8 changes: 7 additions & 1 deletion ...iveaot/System.Private.CoreLib/src/Internal/Runtime/CompilerServices/OpenMethodResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ namespace Internal.Runtime.CompilerServices
[ReflectionBlocked]
public struct OpenMethodResolver : IEquatable<OpenMethodResolver>
{
// Lazy initialized to point to the type loader method when the first `GVMResolve` resolver is created
private static unsafe delegate*<object, RuntimeMethodHandle, nint> s_lazyGvmLookupForSlot;

public const short DispatchResolve = 0;
public const short GVMResolve = 1;
public const short OpenNonVirtualResolve = 2;
Expand Down Expand Up @@ -52,6 +55,9 @@ public unsafe OpenMethodResolver(RuntimeTypeHandle declaringTypeOfSlot, RuntimeM
_handle = handle;
_readerGCHandle = readerGCHandle;
_nonVirtualOpenInvokeCodePointer = IntPtr.Zero;

if (s_lazyGvmLookupForSlot == null)
s_lazyGvmLookupForSlot = &TypeLoaderExports.GVMLookupForSlot;
}

public OpenMethodResolver(RuntimeTypeHandle declaringType, IntPtr codePointer, GCHandle readerGCHandle, int handle)
Expand Down Expand Up @@ -151,7 +157,7 @@ private unsafe IntPtr ResolveMethod(object thisObject)
}
else if (_resolveType == GVMResolve)
{
return TypeLoaderExports.GVMLookupForSlot(thisObject, GVMMethodHandle);
return s_lazyGvmLookupForSlot(thisObject, GVMMethodHandle);
}
else
{
Expand Down