Skip to content

Hide remaining managed EH helpers from the debugger stack #131446

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
tommcdon merged 1 commit into from
Jul 28, 2026
+10 −0
Merged

Hide remaining managed EH helpers from the debugger stack #131446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ private enum RhEHFrameType
RH_EH_FIRST_RETHROW_FRAME = 2,
}

[StackTraceHidden]
[DebuggerHidden]
private static void AppendExceptionStackFrameViaClasslib(object exception, IntPtr ip,
UIntPtr sp, ref ExInfo exInfo,
ref bool isFirstRethrowFrame, ref bool isFirstFrame)
Expand Down Expand Up @@ -994,6 +996,8 @@ private static uint CalculateCodeOffset(byte* pbControlPC, in MethodRegionInfo m
return codeOffset;
}

[StackTraceHidden]
[DebuggerHidden]
private static void UpdateStackTrace(object exceptionObj, UIntPtr curFramePtr, IntPtr ip, UIntPtr sp,
ref bool isFirstRethrowFrame, ref UIntPtr prevFramePtr, ref bool isFirstFrame, ref ExInfo exInfo)
{
Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/StackFrameIterator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,22 @@ internal bool Init(EH.PAL_LIMITED_CONTEXT* pStackwalkCtx, bool instructionFault
return InternalCalls.RhpSfiInit(ref this, pStackwalkCtx, instructionFault, fIsExceptionIntercepted);
}

[StackTraceHidden]
[DebuggerHidden]
internal bool Next()
{
return Next(null, null, null);
}

[StackTraceHidden]
[DebuggerHidden]
internal bool Next(uint* uExCollideClauseIdx, bool* fIsExceptionIntercepted)
{
return Next(uExCollideClauseIdx, null, fIsExceptionIntercepted);
}

[StackTraceHidden]
[DebuggerHidden]
internal bool Next(uint* uExCollideClauseIdx, bool* fUnwoundReversePInvoke, bool* fIsExceptionIntercepted)
{
return InternalCalls.RhpSfiNext(ref this, uExCollideClauseIdx, fUnwoundReversePInvoke, fIsExceptionIntercepted);
Expand Down
Loading