[NativeAOT] Fix stack trace iteration over exceptions (#105877)

* [NativeAOT] Fix stack trace iteration over exceptions * Remove exclusion for b08944b * Remove code that was trying to counter-balance ApplyReturnAddressAdjustment * Update src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp * Simplify comment --------- Co-authored-by: Jan Kotas <[email protected]>
dotnet · Aug 15, 2024 · 6c400b2 · 6c400b2
1 parent 87ce5eb
commit 6c400b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
@@ -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
@@ -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);
     }

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
@@ -1212,9 +1212,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.