Skip to content

Do not allow generic inlining of ldftn requiring a fat function pointer #131439

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
MichalStrehovsky merged 2 commits into from
Jul 28, 2026
+47 −8
Merged

Do not allow generic inlining of ldftn requiring a fat function pointer #131439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
333a3ad
Do not allow generic inlining of ldftn requiring a fat function pointer
agocke Jul 27, 2026
100dd15
Apply batched suggestions from code review
agocke Jul 27, 2026
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
27 changes: 19 additions & 8 deletions src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,15 +1450,26 @@ private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESO

if (pResult->exactContextNeedsRuntimeLookup)
{
MethodDesc caller = HandleToObject(callerHandle);

pResult->codePointerOrStubLookup.lookupKind.needsRuntimeLookup = true;
pResult->codePointerOrStubLookup.runtimeLookup.indirections = CORINFO.USEHELPER;
pResult->codePointerOrStubLookup.runtimeLookup.helper = CorInfoHelpFunc.CORINFO_HELP_READYTORUN_GENERIC_HANDLE;
pResult->codePointerOrStubLookup.lookupKind.runtimeLookupKind = GetGenericRuntimeLookupKind(caller);
object helperArg = GetRuntimeDeterminedObjectForToken(ref pResolvedToken);
ISymbolNode helper = GetGenericLookupHelper(pResult->codePointerOrStubLookup.lookupKind.runtimeLookupKind, ReadyToRunHelperId.MethodEntry, caller, helperArg);
pResult->codePointerOrStubLookup.runtimeLookup.helperEntryPoint = CreateConstLookupToSymbol(helper);

// If this is from a different context, abort. The ReadyToRun helper needs to declare
// its dependencies in terms of the dictionary it will be placed in, but the runtime
// determined method we computed is expressed in terms of the inlinee's generic context.
if (pResolvedToken.tokenContext != contextFromMethodBeingCompiled())
{
pResult->codePointerOrStubLookup.lookupKind.runtimeLookupKind = CORINFO_RUNTIME_LOOKUP_KIND.CORINFO_LOOKUP_NOT_SUPPORTED;
}
else
{
MethodDesc caller = HandleToObject(callerHandle);

pResult->codePointerOrStubLookup.runtimeLookup.indirections = CORINFO.USEHELPER;
pResult->codePointerOrStubLookup.runtimeLookup.helper = CorInfoHelpFunc.CORINFO_HELP_READYTORUN_GENERIC_HANDLE;
pResult->codePointerOrStubLookup.lookupKind.runtimeLookupKind = GetGenericRuntimeLookupKind(caller);
object helperArg = GetRuntimeDeterminedObjectForToken(ref pResolvedToken);
ISymbolNode helper = GetGenericLookupHelper(pResult->codePointerOrStubLookup.lookupKind.runtimeLookupKind, ReadyToRunHelperId.MethodEntry, caller, helperArg);
pResult->codePointerOrStubLookup.runtimeLookup.helperEntryPoint = CreateConstLookupToSymbol(helper);
}
}
else
{
Expand Down
28 changes: 28 additions & 0 deletions src/tests/nativeaot/SmokeTests/UnitTests/Generics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ internal static int Run()
TestGenericInliningTypeGenericsOnly.Run();
Test99198Regression.Run();
Test102259Regression.Run();
Test129093Regression.Run();
Test104913Regression.Run();
Test105397Regression.Run();
Test105880Regression.Run();
Expand Down Expand Up @@ -3790,6 +3791,33 @@ public static void Run()
}
}

class Test129093Regression
{
class Gen<T>
{
[MethodImpl(MethodImplOptions.NoInlining)]
public static Type Method() => typeof(T);
}

// Inlineable generic method taking the address of a method that needs a generic context.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static unsafe nint GetPtr<U>() => (nint)(delegate*<Type>)&Gen<U>.Method;

class Caller<X>
{
[MethodImpl(MethodImplOptions.NoInlining)]
public static nint Run() => GetPtr<X>();
}

public static unsafe void Run()
{
if (((delegate*<Type>)Caller<object>.Run())() != typeof(object))
throw new Exception();
if (((delegate*<Type>)Caller<string>.Run())() != typeof(string))
throw new Exception();
}
}

class Test104913Regression
{
interface IFoo
Expand Down