From 5a6dc58fe62997ead5d70bff670f5f7b17ba9cf9 Mon Sep 17 00:00:00 2001
From: David Wrighton <davidwr@microsoft.com>
Date: Wed, 28 Jan 2026 19:34:02 +0000
Subject: [PATCH] [clr-interp] Windows Arm64 InterpreterStub fix - If the
 ThreadContext is not set up, make sure to set x19 to have the IR bytecode
 address before jumping to
 GetInterpThreadContextWithPossiblyMissingThreadOrCallStub.

---
 src/coreclr/vm/arm64/asmhelpers.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/vm/arm64/asmhelpers.asm b/src/coreclr/vm/arm64/asmhelpers.asm
index 13a93f9340b62e..39d91b74a547a9 100644
--- a/src/coreclr/vm/arm64/asmhelpers.asm
+++ b/src/coreclr/vm/arm64/asmhelpers.asm
@@ -1099,8 +1099,8 @@ JIT_PollGCRarePath
         PROLOG_WITH_TRANSITION_BLOCK
 
         INLINE_GETTHREAD x20, x19
-        cbz x20, NoManagedThreadOrCallStub
         mov x19, METHODDESC_REGISTER ; x19 contains IR bytecode address
+        cbz x20, NoManagedThreadOrCallStub
 
         ldr x11, [x20, #OFFSETOF__Thread__m_pInterpThreadContext]
         cbnz x11, HaveInterpThreadContext