Skip to content

Fix missed case of COOP to PREEMPT transition #131444

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
davidwrighton merged 3 commits into from
Jul 28, 2026
+30 −2
Merged

Fix missed case of COOP to PREEMPT transition #131444

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b6b0dd
Fix missed case of COOP to PREEMPT transition
davidwrighton Jul 27, 2026
63f6b12
Fix additional case found by copilot
davidwrighton Jul 27, 2026
4980541
Fix formatting nit
davidwrighton 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
32 changes: 30 additions & 2 deletions src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,20 @@ MethodDesc* GetTargetPInvokeMethodDesc(PCODE target)
return NULL;
}

static NOINLINE CallStubHeader *InvokeManagedMethodHelper(MethodDesc *pMD, PCODE target)
{
CONTRACTL
{
THROWS;
MODE_ANY;
PRECONDITION(CheckPointer(pMD));
}
CONTRACTL_END

GCX_PREEMP();
return UpdateCallStubForMethod(pMD, target == (PCODE)NULL ? pMD->GetMultiCallableAddrOfCode(CORINFO_ACCESS_ANY) : target);
}

void InvokeManagedMethod(MethodDesc *pMD, int8_t *pArgs, int8_t *pRet, PCODE target, Object** pContinuationRet)
{
CONTRACTL
Expand All @@ -426,7 +440,7 @@ void InvokeManagedMethod(MethodDesc *pMD, int8_t *pArgs, int8_t *pRet, PCODE tar
CallStubHeader *pHeader = pMD->GetCalliCookie();
if (pHeader == NULL)
{
pHeader = UpdateCallStubForMethod(pMD, target == (PCODE)NULL ? pMD->GetMultiCallableAddrOfCode(CORINFO_ACCESS_ANY) : target);
pHeader = InvokeManagedMethodHelper(pMD, target);
}

if (target != (PCODE)NULL)
Expand Down Expand Up @@ -463,6 +477,20 @@ void InvokeUnmanagedMethod(MethodDesc *targetMethod, int8_t *pArgs, int8_t *pRet
InvokeManagedMethod(targetMethod, pArgs, pRet, callTarget, NULL);
}

static NOINLINE CallStubHeader *InvokeDelegateInvokeMethodHelper(MethodDesc *pMDDelegateInvoke)
{
CONTRACTL
{
THROWS;
MODE_ANY;
PRECONDITION(CheckPointer(pMDDelegateInvoke));
}
CONTRACTL_END

GCX_PREEMP();
return UpdateCallStubForMethod(pMDDelegateInvoke, (PCODE)pMDDelegateInvoke->GetMultiCallableAddrOfCode(CORINFO_ACCESS_ANY));
}

void InvokeDelegateInvokeMethod(MethodDesc *pMDDelegateInvoke, int8_t *pArgs, int8_t *pRet, PCODE target, Object** pContinuationRet)
{
CONTRACTL
Expand All @@ -478,7 +506,7 @@ void InvokeDelegateInvokeMethod(MethodDesc *pMDDelegateInvoke, int8_t *pArgs, in
CallStubHeader *stubHeaderTemplate = pMDDelegateInvoke->GetCalliCookie();
if (stubHeaderTemplate == NULL)
{
stubHeaderTemplate = UpdateCallStubForMethod(pMDDelegateInvoke, (PCODE)pMDDelegateInvoke->GetMultiCallableAddrOfCode(CORINFO_ACCESS_ANY));
stubHeaderTemplate = InvokeDelegateInvokeMethodHelper(pMDDelegateInvoke);
}
Comment thread
davidwrighton marked this conversation as resolved.

// CallStubHeaders encode their destination addresses in the Routines array, so they need to be
Expand Down
Loading