Skip to content

Crossgen2: don't mutate getCallInfo token #132186

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
AndyAyersMS merged 1 commit into from
Aug 12, 2026
Merged

Crossgen2: don't mutate getCallInfo token #132186

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
13 changes: 8 additions & 5 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2473,6 +2473,9 @@ private void VerifyMethodSignatureIsStable(MethodSignature methodSig)

private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESOLVED_TOKEN* pConstrainedResolvedToken, CORINFO_METHOD_STRUCT_* callerHandle, CORINFO_CALLINFO_FLAGS flags, CORINFO_CALL_INFO* pResult)
{
// Constraint resolution may update tokenType for internal bookkeeping, but getCallInfo
// treats the resolved token as input and must not expose that mutation to the caller.
CORINFO_RESOLVED_TOKEN resolvedToken = pResolvedToken;
MethodDesc methodToCall;
MethodDesc targetMethod;
TypeDesc constrainedType;
Expand All @@ -2482,7 +2485,7 @@ private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESO
EcmaModule callerModule;
bool useInstantiatingStub;
ceeInfoGetCallInfo(
ref pResolvedToken,
ref resolvedToken,
pConstrainedResolvedToken,
callerHandle,
flags,
Expand Down Expand Up @@ -2550,7 +2553,7 @@ private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESO

pResult->codePointerOrStubLookup.constLookup = CreateConstLookupToSymbol(
_compilation.SymbolNodeFactory.DispatchCell(
ComputeMethodWithToken(targetMethod, ref pResolvedToken, constrainedType: null, unboxing: false),
ComputeMethodWithToken(targetMethod, ref resolvedToken, constrainedType: null, unboxing: false),
MethodBeingCompiled));

// If the abi of the method isn't stable, this will cause a usage of the RequiresRuntimeJitSymbol, which will trigger a RequiresRuntimeJitException
Expand Down Expand Up @@ -2611,7 +2614,7 @@ private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESO
// READYTORUN: FUTURE: Direct calls if possible
pResult->codePointerOrStubLookup.constLookup = CreateConstLookupToSymbol(
_compilation.NodeFactory.MethodEntrypoint(
ComputeMethodWithToken(nonUnboxingMethod, ref pResolvedToken, constrainedType, unboxing: isUnboxingStub),
ComputeMethodWithToken(nonUnboxingMethod, ref resolvedToken, constrainedType, unboxing: isUnboxingStub),
isInstantiatingStub: useInstantiatingStub,
isPrecodeImportRequired: (flags & CORINFO_CALLINFO_FLAGS.CORINFO_CALLINFO_LDFTN) != 0,
isJumpableImportRequired: false));
Expand All @@ -2635,7 +2638,7 @@ private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESO
{
pResult->codePointerOrStubLookup.constLookup = CreateConstLookupToSymbol(
_compilation.NodeFactory.DynamicHelperCell(
ComputeMethodWithToken(targetMethod, ref pResolvedToken, constrainedType: null, unboxing: false),
ComputeMethodWithToken(targetMethod, ref resolvedToken, constrainedType: null, unboxing: false),
useInstantiatingStub));

// Wasm routes all virtual calls through LDVIRTFTN (stub dispatch is unsupported),
Expand Down Expand Up @@ -2665,7 +2668,7 @@ private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESO
{
pResult->instParamLookup = CreateConstLookupToSymbol(_compilation.SymbolNodeFactory.CreateReadyToRunHelper(
ReadyToRunHelperId.MethodDictionary,
ComputeMethodWithToken(targetMethod, ref pResolvedToken, constrainedType: constrainedType, unboxing: false)));
ComputeMethodWithToken(targetMethod, ref resolvedToken, constrainedType: constrainedType, unboxing: false)));
}
else
{
Expand Down
Loading