Skip to content

[clr-interp] Fix timing of UnhandleException handlers #122992

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 2 commits into from
Jan 8, 2026
Merged

[clr-interp] Fix timing of UnhandleException handlers #122992

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95e6dcb
[clr-interp] Fix timing of UnhandleException handlers
davidwrighton Jan 7, 2026
5b45d23
Attempt to fix unix build break
davidwrighton Jan 8, 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
12 changes: 12 additions & 0 deletions src/coreclr/vm/exceptionhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3959,6 +3959,9 @@ CLR_BOOL SfiNextWorker(StackFrameIterator* pThis, uint* uExCollideClauseIdx, CLR
isNativeTransition = (pThis->GetFrameState() == StackFrameIterator::SFITER_NATIVE_MARKER_FRAME);

#ifdef FEATURE_INTERPRETER
bool nativeTransitionFrameIsNextFrame;
nativeTransitionFrameIsNextFrame = false;

if (isNativeTransition &&
(GetIP(pThis->m_crawl.GetRegisterSet()->pCurrentContext) == InterpreterFrame::DummyCallerIP))
{
Expand Down Expand Up @@ -3988,6 +3991,7 @@ CLR_BOOL SfiNextWorker(StackFrameIterator* pThis, uint* uExCollideClauseIdx, CLR
{
// The caller is native code, so we can update the regdisplay to point to it.
pInterpreterFrame->UpdateRegDisplay(pThis->m_crawl.GetRegisterSet(), /* updateFloats */ true);
nativeTransitionFrameIsNextFrame = true;
}
}
}
Expand Down Expand Up @@ -4049,6 +4053,14 @@ CLR_BOOL SfiNextWorker(StackFrameIterator* pThis, uint* uExCollideClauseIdx, CLR
if (isPropagatingToNativeCode)
{
pFrame = pThis->m_crawl.GetFrame();
#ifdef FEATURE_INTERPRETER
if (nativeTransitionFrameIsNextFrame)
{
// Skip the InterpreterFrame that we determined earlier is NOT the frame we consider part of the native transition.
_ASSERTE(pFrame->GetFrameIdentifier() == FrameIdentifier::InterpreterFrame);
pFrame = pFrame->PtrNextFrame();
}
#endif

// Check if there are any further managed frames on the stack or a catch for all exceptions in native code (marked by
// DebuggerU2MCatchHandlerFrame with CatchesAllExceptions() returning true).
Expand Down
Loading