Skip to content

Fix interpreter jmp to pinvoke #121329

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 2 commits into from
Nov 4, 2025
Merged

Fix interpreter jmp to pinvoke #121329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf030d0
Fix interpreter tailcall to pinvoke
janvorli Nov 3, 2025
d7d9813
Inject the ret only for jmp
janvorli Nov 4, 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
27 changes: 27 additions & 0 deletions src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4183,6 +4183,7 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re
int32_t newObjDVar = -1;
InterpType ctorType = InterpTypeO;
int32_t vtsize = 0;
bool injectRet = false;

if (newObjThisArgLocation != INT_MAX)
{
Expand Down Expand Up @@ -4393,7 +4394,11 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re
{
// Tail call target needs to be IL
if (tailcall && isPInvoke && !isMarshaledPInvoke)
{
tailcall = false;
// We need to inject ret after a jmp when we can't use a tail call
injectRet = isJmp;
}

// Normal call
InterpOpcode opcode;
Expand Down Expand Up @@ -4530,6 +4535,28 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re
m_pLastNewIns->info.pCallInfo = (InterpCallInfo*)AllocMemPool0(sizeof (InterpCallInfo));
m_pLastNewIns->info.pCallInfo->pCallArgs = callArgs;

if (injectRet)
{
// Jmp to PInvoke was converted to normal pinvoke, so we need to inject a ret after the call
switch (GetInterpType(callInfo.sig.retType))
{
case InterpTypeVT:
{
AddIns(INTOP_RET_VT);
m_pLastNewIns->SetSVar(dVar);
m_pLastNewIns->data[0] = m_pVars[dVar].size;
break;
}
case InterpTypeVoid:
AddIns(INTOP_RET_VOID);
break;
default:
AddIns(INTOP_RET);
m_pLastNewIns->SetSVar(dVar);
break;
}
}

m_ip += 5;
}

Expand Down
Loading