gthr_aux: Reuse saved_once in non-volatile register

lhmouse · lhmouse · commit 433a18fd9053 · 2026-01-29T01:51:54.000+08:00
diff --git a/mcfgthread/gthr_aux.c b/mcfgthread/gthr_aux.c
@@ -21,6 +21,7 @@ __MCF_gthr_call_once_seh_take_over(_MCF_once* once, __MCF_cxa_dtor_any_ init_pro
   {
 #ifdef __MCF_M_X8632
     __MCF_USING_SEH_HANDLER(do_call_once_seh_unwind, (DWORD) once);
+    _MCF_once* saved_once = once;
 #  define do_seh_once_reg(frm, disp)  (((DWORD**) (frm))[2])
 #else
     __MCF_USING_SEH_HANDLER(do_call_once_seh_unwind);
@@ -41,7 +42,7 @@ __MCF_gthr_call_once_seh_take_over(_MCF_once* once, __MCF_cxa_dtor_any_ init_pro
     __MCF_invoke_cxa_dtor(init_proc, arg);
 
     /* Disarm the once flag with a tail call.  */
-    _MCF_once_release(once);
+    _MCF_once_release(saved_once);
   }
 
 static

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ __MCF_gthr_call_once_seh_take_over(_MCF_once* once, __MCF_cxa_dtor_any_ init_pro`
`21`	`21`	`{`
`22`	`22`	`#ifdef __MCF_M_X8632`
`23`	`23`	`__MCF_USING_SEH_HANDLER(do_call_once_seh_unwind, (DWORD) once);`
	`24`	`+ _MCF_once* saved_once = once;`
`24`	`25`	`# define do_seh_once_reg(frm, disp) (((DWORD**) (frm))[2])`
`25`	`26`	`#else`
`26`	`27`	`__MCF_USING_SEH_HANDLER(do_call_once_seh_unwind);`
`@@ -41,7 +42,7 @@ __MCF_gthr_call_once_seh_take_over(_MCF_once* once, __MCF_cxa_dtor_any_ init_pro`
`41`	`42`	`__MCF_invoke_cxa_dtor(init_proc, arg);`
`42`	`43`
`43`	`44`	`/* Disarm the once flag with a tail call. */`
`44`		`- _MCF_once_release(once);`
	`45`	`+ _MCF_once_release(saved_once);`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`static`