Skip to content

Fix NativeAOT unhandled exception stack trace #91415

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
jkotas merged 4 commits into from
Sep 5, 2023
Merged

Fix NativeAOT unhandled exception stack trace #91415

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0947cc2
Fix NativeAOT unhandled exception stack trace
janvorli Aug 31, 2023
3313937
Add unhandled exception test
janvorli Sep 1, 2023
3b6cdc2
Reflect PR feedback
janvorli Sep 4, 2023
f148f79
Fix Mono console log parsing
janvorli Sep 4, 2023
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: 3 additions & 3 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 @@ -708,14 +708,14 @@ private static void DispatchEx(scoped ref StackFrameIterator frameIter, ref ExIn
uint startIdx = MaxTryRegionIdx;
for (; isValid; isValid = frameIter.Next(&startIdx, &unwoundReversePInvoke))
{
prevControlPC = frameIter.ControlPC;
prevOriginalPC = frameIter.OriginalControlPC;

// For GC stackwalking, we'll happily walk across native code blocks, but for EH dispatch, we
// disallow dispatching exceptions across native code.
if (unwoundReversePInvoke)
break;

prevControlPC = frameIter.ControlPC;
prevOriginalPC = frameIter.OriginalControlPC;

DebugScanCallFrame(exInfo._passNumber, frameIter.ControlPC, frameIter.SP);

UpdateStackTrace(exceptionObj, exInfo._frameIter.FramePointer, (IntPtr)frameIter.OriginalControlPC, frameIter.SP, ref isFirstRethrowFrame, ref prevFramePtr, ref isFirstFrame, ref exInfo);
Expand Down