From b5e1c953996ac40e33973a6a490c545d51338b26 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 2 Aug 2024 16:08:13 +0200
Subject: [PATCH 1/5] [NativeAOT] Fix stack trace iteration over exceptions

---
 src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
index 7ffaf3cab3afe..e48a8c6a97f3e 100644
--- a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
+++ b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
@@ -1830,7 +1830,10 @@ 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 since in that case it's set to the
+    // beginning of the instruction from ExInfo and adjusting it would cause to move
+    // to the previous instruction.
+    if ((m_dwFlags & (ApplyReturnAddressAdjustment | ExCollide)) == ApplyReturnAddressAdjustment)
     {
         m_ControlPC = AdjustReturnAddressBackward(m_ControlPC);
     }

From daba428a36cf0145749c0454d97c260dd3bd7fe3 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 2 Aug 2024 16:08:47 +0200
Subject: [PATCH 2/5] Remove exclusion for b08944b

---
 src/tests/issues.targets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index a1da972936558..4e87627859d2d 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -1215,9 +1215,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.

From 0aa7977fb7d093772742687a7991923c2f16606b Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 2 Aug 2024 18:58:59 +0200
Subject: [PATCH 3/5] Remove code that was trying to counter-balance
 ApplyReturnAddressAdjustment

---
 src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
index e48a8c6a97f3e..15ebfa5316680 100644
--- 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

From 1fad91cbb025324ec329fc5e0db629a80f7a2034 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 3 Aug 2024 06:44:08 +0200
Subject: [PATCH 4/5] Update
 src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp

---
 src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
index 15ebfa5316680..478ffc6b064e4 100644
--- a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
+++ b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
@@ -1825,9 +1825,11 @@ void StackFrameIterator::PrepareToYieldFrame()
     ASSERT(m_pInstance->IsManaged(m_ControlPC) ||
          ((m_dwFlags & SkipNativeFrames) == 0 && (m_dwFlags & UnwoundReversePInvoke) != 0));
 
-    // Do not adjust the PC if ExCollide is set since in that case it's set to the
-    // beginning of the instruction from ExInfo and adjusting it would cause to move
-    // to the previous instruction.
+    // Do not adjust the PC if ExCollide is set. In that case it was either copied from
+    // existing stack frame iterator that was already adjusted, or it's set to the
+    // beginning of the faulting instruction from ExInfo and adjusting it would cause
+    // us to move to the previous instruction which may no longer be in the same try
+    // block.
     if ((m_dwFlags & (ApplyReturnAddressAdjustment | ExCollide)) == ApplyReturnAddressAdjustment)
     {
         m_ControlPC = AdjustReturnAddressBackward(m_ControlPC);

From 20668d34e9dfd5da19f3c571bcc31bd79724dc51 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Thu, 15 Aug 2024 16:05:05 +0200
Subject: [PATCH 5/5] Simplify comment

---
 src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
index 478ffc6b064e4..d2fa4c574b2c1 100644
--- a/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
+++ b/src/coreclr/nativeaot/Runtime/StackFrameIterator.cpp
@@ -1825,11 +1825,8 @@ void StackFrameIterator::PrepareToYieldFrame()
     ASSERT(m_pInstance->IsManaged(m_ControlPC) ||
          ((m_dwFlags & SkipNativeFrames) == 0 && (m_dwFlags & UnwoundReversePInvoke) != 0));
 
-    // Do not adjust the PC if ExCollide is set. In that case it was either copied from
-    // existing stack frame iterator that was already adjusted, or it's set to the
-    // beginning of the faulting instruction from ExInfo and adjusting it would cause
-    // us to move to the previous instruction which may no longer be in the same try
-    // block.
+    // 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);