Skip to content

Fix RhpThrowImpl on ARM32 #125253

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
eduardo-vp merged 4 commits into from
Mar 13, 2026
Merged

Fix RhpThrowImpl on ARM32 #125253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f478aa1
Verify failing test
Mar 6, 2026
1749d26
Save r2 in RhpThrowImpl
Mar 12, 2026
c9c50ee
Add comment
Mar 12, 2026
d6804bd
Update src/coreclr/nativeaot/Runtime/arm/ExceptionHandling.S
eduardo-vp Mar 12, 2026
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
4 changes: 3 additions & 1 deletion src/coreclr/nativeaot/Runtime/arm/ExceptionHandling.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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]

Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,6 @@ public static IEnumerable<object[]> 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)]
Expand Down
Loading