Skip to content

Check return types in isCompatibleMethodGDV #118027

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
merged 8 commits into from
Aug 1, 2025
Merged

Check return types in isCompatibleMethodGDV #118027

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b7e926
Check return types in isCompatibleMethodGDV
EgorBo Jul 24, 2025
f2ed793
cleanup
EgorBo Jul 24, 2025
0be68d0
address feedback
EgorBo Jul 25, 2025
de1d1cf
oops
EgorBo Jul 25, 2025
704c915
cleanup
EgorBo Jul 25, 2025
582c2ef
revert to use getMethodSig
EgorBo Jul 31, 2025
fa30275
Merge branch 'main' into fix-isCompatibleMethodGDV
EgorBo Jul 31, 2025
a2d7e03
Merge branch 'main' into fix-isCompatibleMethodGDV
EgorBo Jul 31, 2025
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
32 changes: 32 additions & 0 deletions src/coreclr/jit/importercalls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7243,6 +7243,38 @@ bool Compiler::isCompatibleMethodGDV(GenTreeCall* call, CORINFO_METHOD_HANDLE gd
CORINFO_ARG_LIST_HANDLE sigParam = sig.args;
unsigned numParams = sig.numArgs;
unsigned numArgs = 0;

var_types gdvType = JITtype2varType(sig.retType);
var_types callType = call->gtReturnType;

const bool sameRetTypes =
(genActualType(callType) == genActualType(gdvType)) || (varTypeIsStruct(callType) && varTypeIsStruct(gdvType));
if (!sameRetTypes)
{
JITDUMP("Incompatible method GDV: Return types do not match - bail out.\n");
return false;
}

if (varTypeIsStruct(gdvType))
{
assert(varTypeIsStruct(callType));

CORINFO_SIG_INFO callSig;
info.compCompHnd->getMethodSig(call->gtCallMethHnd, &callSig);

structPassingKind callRetKind;
structPassingKind gdvRetKind;
getReturnTypeForStruct(callSig.retTypeClass, call->GetUnmanagedCallConv(), &callRetKind);
getReturnTypeForStruct(sig.retTypeClass, call->GetUnmanagedCallConv(), &gdvRetKind);

if ((callRetKind != gdvRetKind) ||
!ClassLayout::AreCompatible(typGetObjLayout(callSig.retTypeClass), typGetObjLayout(sig.retTypeClass)))
{
JITDUMP("Incompatible method GDV: Return struct types do not match - bail out.\n");
return false;
}
}

for (CallArg& arg : call->gtArgs.Args())
{
switch (arg.GetWellKnownArg())
Expand Down
Loading