Skip to content

[NativeAOT] Fix stack trace iteration over exceptions #105877

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
merged 7 commits into from
Aug 15, 2024
Merged

[NativeAOT] Fix stack trace iteration over exceptions #105877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5e1c95
[NativeAOT] Fix stack trace iteration over exceptions
filipnavara Aug 2, 2024
daba428
Remove exclusion for b08944b
filipnavara Aug 2, 2024
0aa7977
Remove code that was trying to counter-balance ApplyReturnAddressAdju…
filipnavara Aug 2, 2024
1fad91c
Update src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
filipnavara Aug 3, 2024
542b0fe
Merge branch 'main' into naot-eh-iter
filipnavara Aug 3, 2024
2991a4d
Merge branch 'main' into naot-eh-iter
jkotas Aug 12, 2024
20668d3
Simplify comment
filipnavara Aug 15, 2024
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
9 changes: 3 additions & 6 deletions src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,11 +811,6 @@ PTR_VOID StackFrameIterator::HandleExCollide(PTR_ExInfo pExInfo)
// Sync our 'current' ExInfo with the updated state (we may have skipped other dispatches)
ResetNextExInfoForSP(m_RegDisplay.GetSP());

// In case m_ControlPC is pre-adjusted, counteract here, since the caller of this routine
// will apply the adjustment again once we return. If the m_ControlPC is not pre-adjusted,
// this is simply an no-op.
m_ControlPC = m_OriginalControlPC;

m_dwFlags = curFlags;

// The iterator has been moved to the "owner frame" (either a parent funclet or the main
Expand Down Expand Up @@ -1830,7 +1825,9 @@ void StackFrameIterator::PrepareToYieldFrame()
ASSERT(m_pInstance->IsManaged(m_ControlPC) ||
((m_dwFlags & SkipNativeFrames) == 0 && (m_dwFlags & UnwoundReversePInvoke) != 0));

if (m_dwFlags & ApplyReturnAddressAdjustment)
// Do not adjust the PC if ExCollide is set. In that case the m_ControlPC was copied from
// another stack frame iterator and it already has a correct value.
if ((m_dwFlags & (ApplyReturnAddressAdjustment | ExCollide)) == ApplyReturnAddressAdjustment)
{
m_ControlPC = AdjustReturnAddressBackward(m_ControlPC);
}
Expand Down
3 changes: 0 additions & 3 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,9 +1209,6 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840/**">
<Issue>https://github.com/dotnet/runtime/issues/101363</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b/**">
<Issue>https://github.com/dotnet/runtime/issues/101364</Issue>
</ExcludeList>
</ItemGroup>

<!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
Expand Down