diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs index 1ee0790037dede..7b1d9ac811835e 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/ExceptionHandling.cs @@ -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) @@ -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) { diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/StackFrameIterator.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/StackFrameIterator.cs index 1d2684dabe4009..6a9577fd935b36 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/StackFrameIterator.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/StackFrameIterator.cs @@ -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);