Skip to content

Fix !m_RedirectContextInUse assert in RestoreContextSimulated on win-x86 #127638

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
jkotas merged 3 commits into from
May 1, 2026
+10 −12
Merged

Fix !m_RedirectContextInUse assert in RestoreContextSimulated on win-x86 #127638

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c7ab4c
Initial plan
Copilot May 1, 2026
39bc3ad
Fix !m_RedirectContextInUse assert on win-x86: replace HandleThreadAb…
Copilot May 1, 2026
f33ab32
Refactor: move RestoreContextSimulated call after abort check in Redi…
Copilot May 1, 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
22 changes: 10 additions & 12 deletions src/coreclr/vm/threadsuspend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2586,8 +2586,6 @@ extern "C" PCONTEXT __stdcall GetCurrentSavedRedirectContext()

void Thread::RestoreContextSimulated(Thread* pThread, CONTEXT* pCtx, void* pFrame, DWORD dwLastError)
{
pThread->HandleThreadAbort(); // Might throw an exception.

// A counter to avoid a nasty case where an
// up-stack filter throws another exception
// causing our filter to be run again for
Expand Down Expand Up @@ -2672,16 +2670,6 @@ void __stdcall Thread::RedirectedHandledJITCase(RedirectReason reason)
// We will restore the state as it was at the point of redirection
// and continue normal execution.

#ifdef TARGET_X86
if (!g_pfnRtlRestoreContext)
{
RestoreContextSimulated(pThread, pCtx, &frame, dwLastError);

// we never return to the caller.
UNREACHABLE();
}
#endif // TARGET_X86

UINT_PTR uAbortAddr;
UINT_PTR uResumePC = (UINT_PTR)GetIP(pCtx);
CopyOSContext(pThread->m_OSContext, pCtx);
Expand All @@ -2707,6 +2695,16 @@ void __stdcall Thread::RedirectedHandledJITCase(RedirectReason reason)
SetIP(pCtx, uAbortAddr);
}

#ifdef TARGET_X86
if (!g_pfnRtlRestoreContext)
{
RestoreContextSimulated(pThread, pCtx, &frame, dwLastError);

// we never return to the caller.
UNREACHABLE();
}
#endif // TARGET_X86

// Unlink the frame in preparation for resuming in managed code
frame.Pop();

Expand Down
Loading