Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/coreclr/vm/eepolicy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,13 @@ void DECLSPEC_NORETURN EEPolicy::HandleFatalStackOverflow(EXCEPTION_POINTERS *pE
if (pExceptionInfo && pExceptionInfo->ContextRecord)
{
GCX_COOP();
#if defined(TARGET_X86) && defined(TARGET_WINDOWS)
// For Windows x86, we don't have a reliable method to unwind to the first managed call frame,
// so we handle at least the cases when the stack overflow happens in JIT helpers
AdjustContextForJITHelpers(pExceptionInfo->ExceptionRecord, pExceptionInfo->ContextRecord);
#else
Thread::VirtualUnwindToFirstManagedCallFrame(pExceptionInfo->ContextRecord);
#endif
fef.InitAndLink(pExceptionInfo->ContextRecord);
}

Expand Down