From f2c9f5eb595c8084cd7871ce25c309cc990e3558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Tue, 24 Feb 2026 17:04:04 +0900 Subject: [PATCH] Don't clobber r2 before we save it --- src/coreclr/nativeaot/Runtime/arm/GcProbe.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/coreclr/nativeaot/Runtime/arm/GcProbe.S b/src/coreclr/nativeaot/Runtime/arm/GcProbe.S index f4729629137c0c..f8057c299e8c20 100644 --- a/src/coreclr/nativeaot/Runtime/arm/GcProbe.S +++ b/src/coreclr/nativeaot/Runtime/arm/GcProbe.S @@ -92,9 +92,9 @@ .endm NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler - PUSH_PROBE_FRAME r2, r3, r12 + PUSH_PROBE_FRAME r3, r2, r12 - ldr r0, [r2, #OFFSETOF__Thread__m_pDeferredTransitionFrame] + ldr r0, [r3, #OFFSETOF__Thread__m_pDeferredTransitionFrame] bl RhpWaitForGC2 POP_PROBE_FRAME @@ -124,7 +124,6 @@ NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler bne LOCAL_LABEL(WaitForGC) bx lr LOCAL_LABEL(WaitForGC): - mov r2, r3 // Move thread pointer to r2 for RhpWaitForGC mov r12, #(DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_R0 + PTFF_SAVE_R1 + PTFF_SAVE_R2) orr r12, r12, #PTFF_THREAD_HIJACK b RhpWaitForGC