Merge pull request #11566 from dra27/unhandled-effect-tweak

dra27 · web-flow · commit 9ed098d5132b · 2022-09-26T22:35:54.000+01:00
Windows fix for #11423
diff --git a/flexdll b/flexdll
@@ -1 +1 @@
-Subproject commit f624a8a94867f616715bf95764466959bbc67a28
+Subproject commit 6b5da460f6b86eccbb72e31b591443bd8f471ea3
diff --git a/runtime/amd64.S b/runtime/amd64.S
@@ -901,7 +901,7 @@ LBL(112):
         movq    Caml_state(current_stack), %rsi
         SWITCH_OCAML_STACKS
     /* No parent stack. Raise Effect.Unhandled. */
-        movq    %rax, %rdi
+        movq    %rax, C_ARG_1
         LEA_VAR(caml_raise_unhandled_effect, %rax)
         jmp     LBL(caml_c_call)
 CFI_ENDPROC
