Skip to content

Fix NotifyOfCHFFilter notification by advancing stackwalk iterator if in NATIVE_MARKER_FRAME state #127683

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
tommcdon wants to merge 11 commits into
base: main
Choose a base branch
from
+10 −0
Open

Fix NotifyOfCHFFilter notification by advancing stackwalk iterator if in NATIVE_MARKER_FRAME state #127683

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a8f2739
Move FuncEvalFrame/DebuggerU2MCatchHandlerFrame detection to SfiNextW…
tommcdon Mar 19, 2026
3dfca14
Update src/coreclr/vm/exceptionhandling.cpp
tommcdon May 3, 2026
5e376f1
fix compilation issue
tommcdon May 3, 2026
0d2dd5e
Apply suggestion from @jkotas
jkotas May 3, 2026
69dcfde
Revert "Apply suggestion from @jkotas"
tommcdon May 7, 2026
d7c9192
Revert "fix compilation issue"
tommcdon May 7, 2026
52f5ccd
Revert "Update src/coreclr/vm/exceptionhandling.cpp"
tommcdon May 7, 2026
c0ef9e6
Revert "Move FuncEvalFrame/DebuggerU2MCatchHandlerFrame detection to …
tommcdon May 7, 2026
7b2af17
When there is a transition from a managed frame to an explicit frame,…
tommcdon May 7, 2026
17e6a1e
Guard Next() call with pFrame != FRAME_TOP in isPropagatingToNativeCo…
tommcdon May 8, 2026
fe62693
Merge branch 'main' into dev/tommcdon/debugNestedFuncEval
tommcdon May 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
10 changes: 10 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 @@ -4035,6 +4035,16 @@ CLR_BOOL SfiNextWorker(StackFrameIterator* pThis, uint* uExCollideClauseIdx, CLR
}
}

// Advance past the native marker frame to the explicit frame (e.g. FuncEvalFrame),
// but only when there is one. When pFrame is FRAME_TOP (e.g. foreign-thread reverse
// PInvoke with no further managed frames), there is no explicit frame to advance to.
if (pFrame != FRAME_TOP)
{
_ASSERTE(pThis->GetFrameState() == StackFrameIterator::SFITER_NATIVE_MARKER_FRAME);
pThis->Next();
_ASSERTE(pThis->GetFrameState() == StackFrameIterator::SFITER_FRAME_FUNCTION);
}

*pfIsExceptionIntercepted = FALSE;

if (fUnwoundReversePInvoke)
Expand Down