diff --git a/src/coreclr/nativeaot/Runtime/arm/ExceptionHandling.S b/src/coreclr/nativeaot/Runtime/arm/ExceptionHandling.S index e2522111524cde..da5716d3bf0b59 100644 --- a/src/coreclr/nativeaot/Runtime/arm/ExceptionHandling.S +++ b/src/coreclr/nativeaot/Runtime/arm/ExceptionHandling.S @@ -127,6 +127,7 @@ NESTED_ENTRY RhpThrowImpl, _TEXT, NoHandler str r4, [sp, #(rsp_offsetof_Context + OFFSETOF__PAL_LIMITED_CONTEXT__SP)] mov r4, r0 // Save exception object + mov r5, r2 // Save ExKind // r0 = GetThread() INLINE_GETTHREAD @@ -143,6 +144,7 @@ NESTED_ENTRY RhpThrowImpl, _TEXT, NoHandler ldr r3, [r0, #OFFSETOF__Thread__m_ppvHijackedReturnAddressLocation] // r4: exception object + // r5: ExKind // r1: hijacked return address // r0: pThread // r3: hijacked return address location @@ -180,7 +182,7 @@ LOCAL_LABEL(NotHiJacked): str r3, [r1, #OFFSETOF__ExInfo__m_exception] // init the exception object to null mov r3, #1 strb r3, [r1, #OFFSETOF__ExInfo__m_passNumber] // init to the first pass - strb r2, [r1, #OFFSETOF__ExInfo__m_kind] // ExKind (from r2) + strb r5, [r1, #OFFSETOF__ExInfo__m_kind] // ExKind mov r3, #0xFFFFFFFF str r3, [r1, #OFFSETOF__ExInfo__m_idxCurClause] diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs b/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs index 276f6485c82030..7b7fa769de3935 100644 --- a/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs +++ b/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs @@ -631,7 +631,6 @@ public static IEnumerable Ctor_Async_TestData() yield return new object[] { () => V2Methods.Bux(), MethodExceptionStrings["Bux"] }; } - [ActiveIssue("https://github.com/dotnet/runtime/issues/123979", typeof(PlatformDetection), nameof(PlatformDetection.IsArmProcess))] [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsRuntimeAsyncSupported))] [MemberData(nameof(Ctor_Async_TestData))] [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]