Fix testStdCallCallbackStackAlignment on win32-x86

tresf · tresf · commit 004c97533bb9 · 2020-11-17T14:14:01.000-05:00
diff --git a/native/libffi/src/x86/ffi.c b/native/libffi/src/x86/ffi.c
@@ -181,6 +181,9 @@ ffi_prep_cif_machdep(ffi_cif *cif)
     {
       ffi_type *t = cif->arg_types[i];
 
+#if defined(_M_IX86)
+      if (cif->abi != FFI_STDCALL)
+#endif
       bytes = FFI_ALIGN (bytes, t->alignment);
       bytes += FFI_ALIGN (t->size, FFI_SIZEOF_ARG);
     }

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,9 @@ ffi_prep_cif_machdep(ffi_cif *cif)`
`181`	`181`	`{`
`182`	`182`	`ffi_type *t = cif->arg_types[i];`
`183`	`183`
	`184`	`+#if defined(_M_IX86)`
	`185`	`+ if (cif->abi != FFI_STDCALL)`
	`186`	`+#endif`
`184`	`187`	`bytes = FFI_ALIGN (bytes, t->alignment);`
`185`	`188`	`bytes += FFI_ALIGN (t->size, FFI_SIZEOF_ARG);`
`186`	`189`	`}`