Skip to content

Cleanup GC mode switching in the interpreter #132468

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

Open
janvorli wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Cleanup GC mode switching in the interpreter #132468

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15018bd
Cleanup GC mode switching in the interpreter
janvorli Aug 18, 2026
d497a83
Make RethrowLastThrownObject NOINLINE static
janvorli Aug 18, 2026
a4807f7
Fix copilot feedback
janvorli Aug 18, 2026
c9a9854
Fix WASM build
janvorli Aug 18, 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: 22 additions & 10 deletions src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ static size_t CreateDispatchTokenForMethod(MethodDesc* pMD)
// Call invoker helpers provided by platform.
void InvokeManagedMethod(MethodDesc *pMD, int8_t *pArgs, int8_t *pRet, PCODE target, Object** pContinuationRet);
void InvokeUnmanagedMethod(MethodDesc *targetMethod, int8_t *pArgs, int8_t *pRet, PCODE callTarget);
void InvokeUnmanagedMethodInPreemptiveMode(MethodDesc *targetMethod, int8_t *pArgs, int8_t *pRet, PCODE callTarget);
void InvokeCalliStub(PCODE ftn, InterpreterCalliCookie cookie, int8_t *pArgs, int8_t *pRet, Object** pContinuationRet);
void InvokeUnmanagedCalli(PCODE ftn, InterpreterCalliCookie cookie, int8_t *pArgs, int8_t *pRet);
void InvokeDelegateInvokeMethod(MethodDesc *pMDDelegateInvoke, int8_t *pArgs, int8_t *pRet, PCODE target, Object** pContinuationRet);
Expand All @@ -232,6 +233,15 @@ LONG IgnoreCppExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo, PVOID pv)
: EXCEPTION_EXECUTE_HANDLER;
}

NOINLINE static void DECLSPEC_NORETURN RethrowLastThrownObject()
{
WRAPPER_NO_CONTRACT;

GCX_COOP();
OBJECTREF ohThrowable = GetThread()->LastThrownObject();
DispatchManagedException(ohThrowable);
}

template<typename Function>
std::invoke_result_t<Function> CallWithSEHWrapper(Function function)
{
Expand All @@ -253,9 +263,7 @@ std::invoke_result_t<Function> CallWithSEHWrapper(Function function)
// INSTALL_/UNINSTALL_UNWIND_AND_CONTINUE_HANDLER in the InterpExecMethod.
// The managed ones are represented by SEH exception, which cannot be handled there
// because it is not possible to handle both SEH and C++ exceptions in the same frame.
GCX_COOP_NO_DTOR();
OBJECTREF ohThrowable = GetThread()->LastThrownObject();
DispatchManagedException(ohThrowable);
RethrowLastThrownObject();
}
PAL_ENDTRY

Expand Down Expand Up @@ -285,10 +293,8 @@ void InvokeUnmanagedMethodWithTransition(MethodDesc *targetMethod, int8_t *stack

PAL_TRY(Param *, pParam, &param)
{
GCX_PREEMP_NO_DTOR();
// WASM-TODO: Handle unmanaged calling conventions
InvokeManagedMethod(pParam->targetMethod, pParam->pArgs, pParam->pRet, pParam->callTarget, NULL);
GCX_PREEMP_NO_DTOR_END();
InvokeUnmanagedMethodInPreemptiveMode(pParam->targetMethod, pParam->pArgs, pParam->pRet, pParam->callTarget);
}
Comment thread
janvorli marked this conversation as resolved.
PAL_EXCEPT_FILTER(IgnoreCppExceptionFilter)
{
Expand All @@ -298,9 +304,7 @@ void InvokeUnmanagedMethodWithTransition(MethodDesc *targetMethod, int8_t *stack
// INSTALL_/UNINSTALL_UNWIND_AND_CONTINUE_HANDLER in the InterpExecMethod.
// The managed ones are represented by SEH exception, which cannot be handled there
// because it is not possible to handle both SEH and C++ exceptions in the same frame.
GCX_COOP_NO_DTOR();
OBJECTREF ohThrowable = GetThread()->LastThrownObject();
DispatchManagedException(ohThrowable);
RethrowLastThrownObject();
}
PAL_ENDTRY

Expand Down Expand Up @@ -616,6 +620,14 @@ CallStubHeader *CreateNativeToInterpreterCallStub(InterpMethod* pInterpMethod)
}
#endif // !TARGET_WASM

void InvokeUnmanagedMethodInPreemptiveMode(MethodDesc *targetMethod, int8_t *pArgs, int8_t *pRet, PCODE callTarget)
{
WRAPPER_NO_CONTRACT;

GCX_PREEMP();
InvokeUnmanagedMethod(targetMethod, pArgs, pRet, callTarget);
}

#ifdef _DEBUG
void DBG_PrintInterpreterStack()
{
Expand Down Expand Up @@ -4809,7 +4821,7 @@ do \
}
catch (const ResumeAfterCatchException& ex)
{
GCX_COOP_NO_DTOR();
_ASSERTE(GetThread()->PreemptiveGCDisabled());
ex.GetResumeContext(&resumeSP, &resumeIP);
_ASSERTE(resumeSP != 0 && resumeIP != 0);

Expand Down
Loading