Fix TheUMEntryPrestub

jakobbotsch · Mar 21, 2024 · 97d8b03 · 97d8b03
1 parent 5e72f8d
commit 97d8b03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/coreclr/vm/amd64/umthunkstub.S b/src/coreclr/vm/amd64/umthunkstub.S
@@ -16,12 +16,13 @@ NESTED_ENTRY TheUMEntryPrestub, _TEXT, UnhandledExceptionHandlerUnix
 
     mov rdi, METHODDESC_REGISTER
     call C_FUNC(TheUMEntryPrestubWorker)
+    mov r10, rax
 
     // we're going to tail call to the exec stub that we just setup
 
     RESTORE_FLOAT_ARGUMENT_REGISTERS 0
     free_stack (SIZEOF_MAX_FP_ARG_SPILL)
     POP_ARGUMENT_REGISTERS
-    TAILJMP_RAX
+    jmp r10
 
 NESTED_END TheUMEntryPrestub, _TEXT
diff --git a/src/coreclr/vm/amd64/unixasmhelpers.S b/src/coreclr/vm/amd64/unixasmhelpers.S
@@ -71,7 +71,7 @@ NESTED_ENTRY NDirectImportThunk, _TEXT, NoHandler
         //
         // Save integer parameter registers.
         // Make sure to preserve r11 as well as it is used to pass the stack argument size from JIT
-        // Make sure to preserve rax as well as it is used for the return buffer for Swift calls
+        // rax is preserved by PUSH_ARGUMENT_REGISTERS as well as it is used for the return buffer for Swift calls
         //
         PUSH_ARGUMENT_REGISTERS
         push_register r11