Skip to content

Fix MVAR resolution in MethodDef_Instance::ResolveToken #3398

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
josesimoes merged 2 commits into from
May 29, 2026
Merged

Fix MVAR resolution in MethodDef_Instance::ResolveToken #3398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ca5929
Fix MVAR resolution in MethodDef_Instance::ResolveToken
josesimoes May 29, 2026
00ac219
Fixes from code review
josesimoes May 29, 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
37 changes: 27 additions & 10 deletions src/CLR/Core/TypeSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2254,16 +2254,15 @@ bool CLR_RT_MethodDef_Instance::ResolveToken(

if (argElem.DataType == DATATYPE_MVAR)
{
if (caller != nullptr && NANOCLR_INDEX_IS_VALID(caller->arrayElementType) &&
argElem.GenericParamPosition == 0)
{
resolvedArgs[a] = caller->arrayElementType;
}
else
// The MethodSpec carries the explicit IL-encoded generic arguments for this
// call and is authoritative. It must take precedence over arrayElementType,
// which is only a runtime-inferred fallback (used for SZArrayHelper-style
// dispatch) and can be stale when propagated across generic method
// boundaries.
if (hasMethodSpec)
{
CLR_RT_SignatureParser::Element msArgElem{};
if (hasMethodSpec &&
msInst.GetGenericArgument(argElem.GenericParamPosition, msArgElem))
if (msInst.GetGenericArgument(argElem.GenericParamPosition, msArgElem))
{
if (msArgElem.DataType == DATATYPE_VAR &&
caller->genericType != nullptr &&
Expand All @@ -2274,7 +2273,8 @@ bool CLR_RT_MethodDef_Instance::ResolveToken(
if (callerTsInst.InitializeFromIndex(*caller->genericType) &&
callerTsInst.GetGenericParam(
msArgElem.GenericParamPosition,
paramElem))
paramElem) &&
NANOCLR_INDEX_IS_VALID(paramElem.Class))
{
resolvedArgs[a] = paramElem.Class;
}
Expand All @@ -2283,16 +2283,33 @@ bool CLR_RT_MethodDef_Instance::ResolveToken(
allResolved = false;
}
}
else
else if (NANOCLR_INDEX_IS_VALID(msArgElem.Class))
{
resolvedArgs[a] = msArgElem.Class;
}
else
{
// A DATATYPE_VAR without a resolvable caller context, or any
// other element that did not yield a concrete type, must fail
// resolution rather than bind to an empty Class index.
allResolved = false;
}
}
else
{
allResolved = false;
}
}
else if (
caller != nullptr && NANOCLR_INDEX_IS_VALID(caller->arrayElementType) &&
argElem.GenericParamPosition == 0)
{
resolvedArgs[a] = caller->arrayElementType;
}
else
{
allResolved = false;
}
}
else if (argElem.DataType == DATATYPE_VAR)
{
Expand Down