ffi 1.16.3 → 1.17.0.rc1

data/ext/ffi_c/libffi/testsuite/Makefile.in

@@ -290,133 +290,85 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign dejagnu
 EXTRA_DEJAGNU_SITE_CONFIG = ../local.exp
 CLEANFILES = *.exe core* *.log *.sum
-EXTRA_DIST = config/default.exp lib/libffi.exp lib/target-libpath.exp	\
-lib/wrapper.exp libffi.bhaible/Makefile libffi.bhaible/README		\
-libffi.bhaible/alignof.h libffi.bhaible/bhaible.exp			\
-libffi.bhaible/test-call.c libffi.bhaible/test-callback.c		\
-libffi.bhaible/testcases.c libffi.call/align_mixed.c			\
-libffi.call/align_stdcall.c libffi.call/call.exp			\
-libffi.call/err_bad_typedef.c libffi.call/ffitest.h			\
-libffi.call/float.c libffi.call/float1.c libffi.call/float2.c		\
-libffi.call/float3.c libffi.call/float4.c libffi.call/float_va.c	\
-libffi.call/many.c libffi.call/many2.c libffi.call/many_double.c	\
-libffi.call/many_mixed.c libffi.call/negint.c libffi.call/offsets.c	\
-libffi.call/pr1172638.c libffi.call/promotion.c				\
-libffi.call/pyobjc_tc.c libffi.call/return_dbl.c			\
-libffi.call/return_dbl1.c libffi.call/return_dbl2.c			\
-libffi.call/return_fl.c libffi.call/return_fl1.c                        \
-libffi.call/return_fl2.c libffi.call/return_fl3.c                       \
-libffi.call/return_ldl.c libffi.call/return_ll.c                        \
-libffi.call/return_ll1.c libffi.call/return_sc.c                        \
-libffi.call/return_sl.c libffi.call/return_uc.c                         \
-libffi.call/return_ul.c libffi.call/struct1.c libffi.call/struct10.c    \
-libffi.call/struct2.c libffi.call/struct3.c libffi.call/struct4.c       \
-libffi.call/struct5.c libffi.call/struct6.c libffi.call/struct7.c       \
-libffi.call/struct8.c libffi.call/struct9.c                             \
-libffi.call/uninitialized.c libffi.call/va_1.c libffi.call/va_2.c       \
-libffi.call/va_3.c libffi.call/va_struct1.c libffi.call/va_struct2.c    \
-libffi.call/va_struct3.c libffi.call/struct_by_value_big.c              \
-libffi.call/struct_return_8H.c libffi.call/struct_return_2H.c           \
-libffi.call/struct_by_value_2.c libffi.call/struct_by_value_3.c         \
-libffi.call/struct_by_value_4.c libffi.call/struct_by_value_small.c     \
-libffi.call/strlen2.c libffi.call/strlen3.c libffi.call/strlen4.c       \
-libffi.call/strlen.c libffi.call/va_3.c                                 \
-libffi.call/struct_by_value_2.c libffi.call/struct_by_value_3.c         \
-libffi.call/struct_by_value_4.c libffi.closures/closure.exp             \
-libffi.call/struct_by_value_3f.c libffi.call/struct_by_value_4f.c       \
-libffi.call/s55.c libffi.call/bpo-38748.c                               \
-libffi.closures/closure_fn0.c libffi.closures/closure_fn1.c             \
-libffi.closures/closure_fn2.c libffi.closures/closure_fn3.c             \
-libffi.closures/closure_fn4.c libffi.closures/closure_fn5.c             \
-libffi.closures/closure_fn6.c libffi.closures/closure_loc_fn0.c         \
-libffi.closures/closure_simple.c libffi.closures/cls_12byte.c           \
-libffi.closures/cls_16byte.c libffi.closures/cls_18byte.c               \
-libffi.closures/cls_19byte.c libffi.closures/cls_1_1byte.c              \
-libffi.closures/cls_20byte.c libffi.closures/cls_20byte1.c              \
-libffi.closures/cls_24byte.c libffi.closures/cls_2byte.c                \
-libffi.closures/cls_3_1byte.c libffi.closures/cls_3byte1.c              \
-libffi.closures/cls_3byte2.c libffi.closures/cls_3float.c               \
-libffi.closures/cls_4_1byte.c libffi.closures/cls_4byte.c               \
-libffi.closures/cls_5_1_byte.c libffi.closures/cls_5byte.c              \
-libffi.closures/cls_64byte.c libffi.closures/cls_6_1_byte.c             \
-libffi.closures/cls_6byte.c libffi.closures/cls_7_1_byte.c              \
-libffi.closures/cls_7byte.c libffi.closures/cls_8byte.c                 \
-libffi.closures/cls_9byte1.c libffi.closures/cls_9byte2.c               \
-libffi.closures/cls_align_double.c libffi.closures/cls_align_float.c    \
-libffi.closures/cls_align_longdouble.c                                  \
-libffi.closures/cls_align_pointer.c                                     \
-libffi.closures/cls_align_sint16.c libffi.closures/cls_align_sint32.c   \
-libffi.closures/cls_align_sint64.c libffi.closures/cls_align_uint16.c   \
-libffi.closures/cls_align_uint32.c libffi.closures/cls_align_uint64.c   \
-libffi.closures/cls_dbls_struct.c libffi.closures/cls_double.c          \
-libffi.closures/cls_double_va.c libffi.closures/cls_float.c             \
-libffi.closures/cls_longdouble_va.c                                     \
-libffi.closures/cls_many_mixed_args.c                                   \
-libffi.closures/cls_many_mixed_float_double.c                           \
-libffi.closures/cls_multi_schar.c libffi.closures/cls_multi_sshort.c    \
-libffi.closures/cls_multi_sshortchar.c                                  \
-libffi.closures/cls_multi_uchar.c libffi.closures/cls_multi_ushort.c    \
-libffi.closures/cls_multi_ushortchar.c libffi.closures/cls_pointer.c    \
-libffi.closures/cls_pointer_stack.c libffi.closures/cls_schar.c         \
-libffi.closures/cls_sint.c libffi.closures/cls_sshort.c                 \
-libffi.closures/cls_struct_va1.c libffi.closures/cls_uchar.c            \
-libffi.closures/cls_uint.c libffi.closures/cls_uint_va.c                \
-libffi.closures/cls_ulong_va.c libffi.closures/cls_ulonglong.c          \
-libffi.closures/cls_ushort.c libffi.closures/err_bad_abi.c              \
-libffi.closures/ffitest.h libffi.closures/nested_struct.c               \
-libffi.closures/nested_struct1.c libffi.closures/nested_struct10.c      \
-libffi.closures/nested_struct11.c libffi.closures/nested_struct12.c     \
-libffi.closures/nested_struct13.c libffi.closures/nested_struct2.c      \
-libffi.closures/nested_struct3.c libffi.closures/nested_struct4.c       \
-libffi.closures/nested_struct5.c libffi.closures/nested_struct6.c       \
-libffi.closures/nested_struct7.c libffi.closures/nested_struct8.c       \
-libffi.closures/nested_struct9.c libffi.closures/problem1.c             \
-libffi.closures/single_entry_structs1.c                                 \
-libffi.closures/single_entry_structs2.c                                 \
-libffi.closures/single_entry_structs3.c libffi.closures/stret_large.c   \
-libffi.closures/stret_large2.c libffi.closures/stret_medium.c           \
-libffi.closures/stret_medium2.c libffi.closures/testclosure.c           \
-libffi.closures/unwindtest.cc libffi.closures/unwindtest_ffi_call.cc    \
-libffi.closures/cls_align_longdouble_split.c                            \
-libffi.closures/cls_align_longdouble_split2.c                           \
-libffi.closures/cls_longdouble.c libffi.closures/huge_struct.c          \
-libffi.complex/cls_align_complex.inc                                    \
-libffi.complex/cls_align_complex_double.c                               \
-libffi.complex/cls_align_complex_float.c                                \
-libffi.complex/cls_align_complex_longdouble.c                           \
-libffi.complex/cls_complex.inc libffi.complex/cls_complex_double.c      \
-libffi.complex/cls_complex_float.c                                      \
-libffi.complex/cls_complex_longdouble.c                                 \
-libffi.complex/cls_complex_struct.inc                                   \
-libffi.complex/cls_complex_struct_double.c                              \
-libffi.complex/cls_complex_struct_float.c                               \
-libffi.complex/cls_complex_struct_longdouble.c                          \
-libffi.complex/cls_complex_va.inc                                       \
-libffi.complex/cls_complex_va_double.c                                  \
-libffi.complex/cls_complex_va_float.c                                   \
-libffi.complex/cls_complex_va_longdouble.c libffi.complex/complex.exp   \
-libffi.complex/complex.inc libffi.complex/complex_defs_double.inc       \
-libffi.complex/complex_defs_float.inc                                   \
-libffi.complex/complex_defs_longdouble.inc                              \
-libffi.complex/complex_double.c libffi.complex/complex_float.c          \
-libffi.complex/complex_int.c libffi.complex/complex_longdouble.c        \
-libffi.complex/ffitest.h libffi.complex/many_complex.inc                \
-libffi.complex/many_complex_double.c                                    \
-libffi.complex/many_complex_float.c                                     \
-libffi.complex/many_complex_longdouble.c                                \
-libffi.complex/return_complex.inc libffi.complex/return_complex1.inc    \
-libffi.complex/return_complex1_double.c                                 \
-libffi.complex/return_complex1_float.c                                  \
-libffi.complex/return_complex1_longdouble.c                             \
-libffi.complex/return_complex2.inc                                      \
-libffi.complex/return_complex2_double.c                                 \
-libffi.complex/return_complex2_float.c                                  \
-libffi.complex/return_complex2_longdouble.c                             \
-libffi.complex/return_complex_double.c                                  \
-libffi.complex/return_complex_float.c                                   \
-libffi.complex/return_complex_longdouble.c libffi.go/aa-direct.c        \
-libffi.go/closure1.c libffi.go/ffitest.h libffi.go/go.exp               \
-libffi.go/static-chain.h
+EXTRA_DIST = config/default.exp emscripten/build.sh emscripten/conftest.py \
+	emscripten/node-tests.sh emscripten/test.html emscripten/test_libffi.py \
+	emscripten/build-tests.sh lib/libffi.exp lib/target-libpath.exp \
+	lib/wrapper.exp libffi.bhaible/Makefile libffi.bhaible/README \
+	libffi.bhaible/alignof.h libffi.bhaible/bhaible.exp libffi.bhaible/test-call.c \
+	libffi.bhaible/test-callback.c libffi.bhaible/testcases.c libffi.call/align_mixed.c \
+	libffi.call/align_stdcall.c libffi.call/bpo_38748.c libffi.call/call.exp \
+	libffi.call/err_bad_typedef.c libffi.call/ffitest.h libffi.call/float.c \
+	libffi.call/float1.c libffi.call/float2.c libffi.call/float3.c \
+	libffi.call/float4.c libffi.call/float_va.c libffi.call/many.c \
+	libffi.call/many2.c libffi.call/many_double.c libffi.call/many_mixed.c \
+	libffi.call/negint.c libffi.call/offsets.c libffi.call/pr1172638.c \
+	libffi.call/promotion.c libffi.call/pyobjc_tc.c libffi.call/return_dbl.c \
+	libffi.call/return_dbl1.c libffi.call/return_dbl2.c libffi.call/return_fl.c \
+	libffi.call/return_fl1.c libffi.call/return_fl2.c libffi.call/return_fl3.c \
+	libffi.call/return_ldl.c libffi.call/return_ll.c libffi.call/return_ll1.c \
+	libffi.call/return_sc.c libffi.call/return_sl.c libffi.call/return_uc.c \
+	libffi.call/return_ul.c libffi.call/s55.c libffi.call/strlen.c \
+	libffi.call/strlen2.c libffi.call/strlen3.c libffi.call/strlen4.c \
+	libffi.call/struct1.c libffi.call/struct10.c libffi.call/struct2.c \
+	libffi.call/struct3.c libffi.call/struct4.c libffi.call/struct5.c \
+	libffi.call/struct6.c libffi.call/struct7.c libffi.call/struct8.c \
+	libffi.call/struct9.c libffi.call/struct_by_value_2.c libffi.call/struct_by_value_3.c \
+	libffi.call/struct_by_value_3f.c libffi.call/struct_by_value_4.c libffi.call/struct_by_value_4f.c \
+	libffi.call/struct_by_value_big.c libffi.call/struct_by_value_small.c libffi.call/struct_return_2H.c \
+	libffi.call/struct_return_8H.c libffi.call/uninitialized.c libffi.call/va_1.c \
+	libffi.call/va_2.c libffi.call/va_3.c libffi.call/va_struct1.c \
+	libffi.call/va_struct2.c libffi.call/va_struct3.c libffi.call/callback.c \
+	libffi.call/callback2.c libffi.call/callback3.c libffi.call/callback4.c \
+	libffi.closures/closure.exp libffi.closures/closure_fn0.c libffi.closures/closure_fn1.c \
+	libffi.closures/closure_fn2.c libffi.closures/closure_fn3.c libffi.closures/closure_fn4.c \
+	libffi.closures/closure_fn5.c libffi.closures/closure_fn6.c libffi.closures/closure_loc_fn0.c \
+	libffi.closures/closure_simple.c libffi.closures/cls_12byte.c libffi.closures/cls_16byte.c \
+	libffi.closures/cls_18byte.c libffi.closures/cls_19byte.c libffi.closures/cls_1_1byte.c \
+	libffi.closures/cls_20byte.c libffi.closures/cls_20byte1.c libffi.closures/cls_24byte.c \
+	libffi.closures/cls_2byte.c libffi.closures/cls_3_1byte.c libffi.closures/cls_3byte1.c \
+	libffi.closures/cls_3byte2.c libffi.closures/cls_3float.c libffi.closures/cls_4_1byte.c \
+	libffi.closures/cls_4byte.c libffi.closures/cls_5_1_byte.c libffi.closures/cls_5byte.c \
+	libffi.closures/cls_64byte.c libffi.closures/cls_6_1_byte.c libffi.closures/cls_6byte.c \
+	libffi.closures/cls_7_1_byte.c libffi.closures/cls_7byte.c libffi.closures/cls_8byte.c \
+	libffi.closures/cls_9byte1.c libffi.closures/cls_9byte2.c libffi.closures/cls_align_double.c \
+	libffi.closures/cls_align_float.c libffi.closures/cls_align_longdouble.c libffi.closures/cls_align_longdouble_split.c \
+	libffi.closures/cls_align_longdouble_split2.c libffi.closures/cls_align_pointer.c libffi.closures/cls_align_sint16.c \
+	libffi.closures/cls_align_sint32.c libffi.closures/cls_align_sint64.c libffi.closures/cls_align_uint16.c \
+	libffi.closures/cls_align_uint32.c libffi.closures/cls_align_uint64.c libffi.closures/cls_dbls_struct.c \
+	libffi.closures/cls_double.c libffi.closures/cls_double_va.c libffi.closures/cls_float.c \
+	libffi.closures/cls_longdouble.c libffi.closures/cls_longdouble_va.c libffi.closures/cls_many_mixed_args.c \
+	libffi.closures/cls_many_mixed_float_double.c libffi.closures/cls_multi_schar.c libffi.closures/cls_multi_sshort.c \
+	libffi.closures/cls_multi_sshortchar.c libffi.closures/cls_multi_uchar.c libffi.closures/cls_multi_ushort.c \
+	libffi.closures/cls_multi_ushortchar.c libffi.closures/cls_pointer.c libffi.closures/cls_pointer_stack.c \
+	libffi.closures/cls_schar.c libffi.closures/cls_sint.c libffi.closures/cls_sshort.c \
+	libffi.closures/cls_struct_va1.c libffi.closures/cls_uchar.c libffi.closures/cls_uint.c \
+	libffi.closures/cls_uint_va.c libffi.closures/cls_ulong_va.c libffi.closures/cls_ulonglong.c \
+	libffi.closures/cls_ushort.c libffi.closures/err_bad_abi.c libffi.closures/ffitest.h \
+	libffi.closures/huge_struct.c libffi.closures/nested_struct.c libffi.closures/nested_struct1.c \
+	libffi.closures/nested_struct10.c libffi.closures/nested_struct11.c libffi.closures/nested_struct12.c \
+	libffi.closures/nested_struct13.c libffi.closures/nested_struct2.c libffi.closures/nested_struct3.c \
+	libffi.closures/nested_struct4.c libffi.closures/nested_struct5.c libffi.closures/nested_struct6.c \
+	libffi.closures/nested_struct7.c libffi.closures/nested_struct8.c libffi.closures/nested_struct9.c \
+	libffi.closures/problem1.c libffi.closures/single_entry_structs1.c libffi.closures/single_entry_structs2.c \
+	libffi.closures/single_entry_structs3.c libffi.closures/stret_large.c libffi.closures/stret_large2.c \
+	libffi.closures/stret_medium.c libffi.closures/stret_medium2.c libffi.closures/testclosure.c \
+	libffi.closures/unwindtest.cc libffi.closures/unwindtest_ffi_call.cc libffi.complex/cls_align_complex.inc \
+	libffi.complex/cls_align_complex_double.c libffi.complex/cls_align_complex_float.c libffi.complex/cls_align_complex_longdouble.c \
+	libffi.complex/cls_complex.inc libffi.complex/cls_complex_double.c libffi.complex/cls_complex_float.c \
+	libffi.complex/cls_complex_longdouble.c libffi.complex/cls_complex_struct.inc libffi.complex/cls_complex_struct_double.c \
+	libffi.complex/cls_complex_struct_float.c libffi.complex/cls_complex_struct_longdouble.c libffi.complex/cls_complex_va.inc \
+	libffi.complex/cls_complex_va_double.c libffi.complex/cls_complex_va_float.c libffi.complex/cls_complex_va_longdouble.c \
+	libffi.complex/complex.exp libffi.complex/complex.inc libffi.complex/complex_defs_double.inc \
+	libffi.complex/complex_defs_float.inc libffi.complex/complex_defs_longdouble.inc libffi.complex/complex_double.c \
+	libffi.complex/complex_float.c libffi.complex/complex_int.c libffi.complex/complex_longdouble.c \
+	libffi.complex/ffitest.h libffi.complex/many_complex.inc libffi.complex/many_complex_double.c \
+	libffi.complex/many_complex_float.c libffi.complex/many_complex_longdouble.c libffi.complex/return_complex.inc \
+	libffi.complex/return_complex1.inc libffi.complex/return_complex1_double.c libffi.complex/return_complex1_float.c \
+	libffi.complex/return_complex1_longdouble.c libffi.complex/return_complex2.inc libffi.complex/return_complex2_double.c \
+	libffi.complex/return_complex2_float.c libffi.complex/return_complex2_longdouble.c libffi.complex/return_complex_double.c \
+	libffi.complex/return_complex_float.c libffi.complex/return_complex_longdouble.c libffi.go/aa-direct.c \
+	libffi.go/closure1.c libffi.go/ffitest.h libffi.go/go.exp \
+	libffi.go/static-chain.h Makefile.am Makefile.in
 
 all: all-am
 

data/ext/ffi_c/libffi/testsuite/emscripten/conftest.py

@@ -3,6 +3,8 @@ from pytest import fixture
 from pytest_pyodide.server import spawn_web_server
 from pytest_pyodide import runner
 
+import logging
+
 TEST_PATH = Path(__file__).parents[1].resolve()
 
 
@@ -47,6 +49,10 @@ RUNNER_DICT = {x.browser: x for x in [FirefoxRunner, ChromeRunner]}
 def selenium_class_scope(request, web_server_main):
     server_hostname, server_port, server_log = web_server_main
     assert request.param in RUNNER_DICT
+
+    logger = logging.getLogger('selenium')
+    logger.setLevel(logging.DEBUG)
+
     cls = RUNNER_DICT[request.param]
     selenium = cls(
         test_dir=request.cls.TEST_BUILD_DIR,

data/ext/ffi_c/libffi/testsuite/libffi.call/callback.c

@@ -0,0 +1,99 @@
+/* Area:	ffi_call
+   Purpose:	Check structures with array and callback.
+   Limitations:	none.
+   PR:		none.
+   Originator:	David Tenty <daltenty@ibm.com>  */
+
+/* { dg-do run } */
+#include "ffitest.h"
+
+int i=5;
+
+void callback(void) { i++; }
+
+typedef struct
+{
+  unsigned char c1;
+  double s[2];
+  unsigned char c2;
+} test_structure_12;
+
+static test_structure_12 ABI_ATTR struct12 (test_structure_12 ts, void (*func)(void))
+{
+  ts.c1 += 1;
+  ts.c2 += 1;
+  ts.s[0] += 1;
+  ts.s[1] += 1;
+
+  func();
+  return ts;
+}
+
+int main (void)
+{
+  ffi_cif cif;
+  ffi_type *args[MAX_ARGS];
+  void *values[MAX_ARGS];
+  ffi_type ts12_type,ts12a_type;
+  ffi_type *ts12_type_elements[4];
+  ffi_type *ts12a_type_elements[3];
+
+  test_structure_12 ts12_arg;
+  void (*ptr)(void)=&callback;
+
+  test_structure_12 *ts12_result =
+    (test_structure_12 *) malloc (sizeof(test_structure_12));
+
+  ts12a_type.size = 0;
+  ts12a_type.alignment = 0;
+  ts12a_type.type = FFI_TYPE_STRUCT;
+  ts12a_type.elements = ts12a_type_elements;
+  ts12a_type_elements[0] = &ffi_type_double;
+  ts12a_type_elements[1] = &ffi_type_double;
+  ts12a_type_elements[2] = NULL;
+
+  ts12_type.size = 0;
+  ts12_type.alignment = 0;
+  ts12_type.type = FFI_TYPE_STRUCT;
+  ts12_type.elements = ts12_type_elements;
+  ts12_type_elements[0] = &ffi_type_uchar;
+  ts12_type_elements[1] = &ts12a_type;
+  ts12_type_elements[2] = &ffi_type_uchar;
+  ts12_type_elements[3] = NULL;
+
+
+  args[0] = &ts12_type;
+  args[1] = &ffi_type_pointer;
+  values[0] = &ts12_arg;
+  values[1] = &ptr;
+
+  CHECK(ffi_prep_cif(&cif, ABI_NUM, 2, &ts12_type, args) == FFI_OK);
+
+  ts12_arg.c1 = 5;
+  ts12_arg.c2 = 6;
+  ts12_arg.s[0] = 7.77;
+  ts12_arg.s[1] = 8.88;
+
+  printf ("%u\n", ts12_arg.c1);
+  printf ("%u\n", ts12_arg.c2);
+  printf ("%g\n", ts12_arg.s[0]);
+  printf ("%g\n", ts12_arg.s[1]);
+  printf ("%d\n", i);
+
+  ffi_call(&cif, FFI_FN(struct12), ts12_result, values);
+
+  printf ("%u\n", ts12_result->c1);
+  printf ("%u\n", ts12_result->c2);
+  printf ("%g\n", ts12_result->s[0]);
+  printf ("%g\n", ts12_result->s[1]);
+  printf ("%d\n", i);
+  CHECK(ts12_result->c1 == 5 + 1);
+  CHECK(ts12_result->c2 == 6 + 1);
+  CHECK(ts12_result->s[0] == 7.77 + 1);
+  CHECK(ts12_result->s[1] == 8.88 + 1);
+  CHECK(i == 5 + 1);
+  CHECK(ts12_type.size == sizeof(test_structure_12));
+
+  free (ts12_result);
+  exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.call/callback2.c

@@ -0,0 +1,108 @@
+/* Area:	ffi_call
+   Purpose:	Check structures with nested array and callback.
+   Limitations:	none.
+   PR:		none.
+   Originator:	David Tenty <daltenty@ibm.com>  */
+
+/* { dg-do run } */
+#include "ffitest.h"
+
+int i=5;
+
+void callback(void) { i++; }
+
+typedef struct
+{
+  struct { double d; } s1;
+  double s[2];
+  unsigned char c2;
+} test_structure_12;
+
+static test_structure_12 ABI_ATTR struct12 (test_structure_12 ts, void (*func)(void))
+{
+  ts.s1.d += 1;
+  ts.c2 += 1;
+  ts.s[0] += 1;
+  ts.s[1] += 1;
+
+  func();
+  return ts;
+}
+
+int main (void)
+{
+  ffi_cif cif;
+  ffi_type *args[MAX_ARGS];
+  void *values[MAX_ARGS];
+  ffi_type ts12_type,ts12a_type, ts12b_type;
+  ffi_type *ts12_type_elements[4];
+  ffi_type *ts12a_type_elements[2];
+  ffi_type *ts12b_type_elements[3];
+
+
+  test_structure_12 ts12_arg;
+  void (*ptr)(void)=&callback;
+
+  test_structure_12 *ts12_result =
+    (test_structure_12 *) malloc (sizeof(test_structure_12));
+
+  ts12a_type.size = 0;
+  ts12a_type.alignment = 0;
+  ts12a_type.type = FFI_TYPE_STRUCT;
+  ts12a_type.elements = ts12a_type_elements;
+  ts12a_type_elements[0] = &ffi_type_double;
+  ts12a_type_elements[1] = NULL;
+
+  ts12b_type.size = 0;
+  ts12b_type.alignment = 0;
+  ts12b_type.type = FFI_TYPE_STRUCT;
+  ts12b_type.elements = ts12b_type_elements;
+  ts12b_type_elements[0] = &ffi_type_double;
+  ts12b_type_elements[1] = &ffi_type_double;
+  ts12b_type_elements[2] = NULL;
+
+  ts12_type.size = 0;
+  ts12_type.alignment = 0;
+  ts12_type.type = FFI_TYPE_STRUCT;
+  ts12_type.elements = ts12_type_elements;
+  ts12_type_elements[0] = &ts12a_type;
+  ts12_type_elements[1] = &ts12b_type;
+  ts12_type_elements[2] = &ffi_type_uchar;
+  ts12_type_elements[3] = NULL;
+
+
+  args[0] = &ts12_type;
+  args[1] = &ffi_type_pointer;
+  values[0] = &ts12_arg;
+  values[1] = &ptr;
+
+  CHECK(ffi_prep_cif(&cif, ABI_NUM, 2, &ts12_type, args) == FFI_OK);
+
+  ts12_arg.s1.d = 5.55;
+  ts12_arg.c2 = 6;
+  ts12_arg.s[0] = 7.77;
+  ts12_arg.s[1] = 8.88;
+
+  printf ("%g\n", ts12_arg.s1.d);
+  printf ("%u\n", ts12_arg.c2);
+  printf ("%g\n", ts12_arg.s[0]);
+  printf ("%g\n", ts12_arg.s[1]);
+  printf ("%d\n", i);
+
+  ffi_call(&cif, FFI_FN(struct12), ts12_result, values);
+
+  printf ("%g\n", ts12_result->s1.d);
+  printf ("%u\n", ts12_result->c2);
+  printf ("%g\n", ts12_result->s[0]);
+  printf ("%g\n", ts12_result->s[1]);
+  printf ("%d\n", i);
+  CHECK(ts12_result->s1.d == 5.55 + 1);
+  CHECK(ts12_result->c2 == 6 + 1);
+  CHECK(ts12_result->s[0] == 7.77 + 1);
+  CHECK(ts12_result->s[1] == 8.88 + 1);
+  CHECK(i == 5 + 1);
+  CHECK(ts12_type.size == sizeof(test_structure_12));
+
+  free (ts12_result);
+  exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.call/callback3.c

@@ -0,0 +1,114 @@
+/* Area:	ffi_call
+   Purpose:	Check structures with array and callback.
+   Limitations:	none.
+   PR:		none.
+   Originator:	David Tenty <daltenty@ibm.com>  */
+
+/* { dg-do run } */
+#include "ffitest.h"
+
+int i=5;
+
+void callback(void) { i++; }
+
+
+typedef struct
+{
+  struct { unsigned char c; double d; } s1;
+  double s[2];
+  unsigned char c2;
+} test_structure_12;
+
+static test_structure_12 ABI_ATTR struct12 (test_structure_12 ts, void (*func)(void))
+{
+  ts.s1.c += 1;
+  ts.s1.d += 1;
+  ts.c2 += 1;
+  ts.s[0] += 1;
+  ts.s[1] += 1;
+
+  func();
+  return ts;
+}
+
+int main (void)
+{
+  ffi_cif cif;
+  ffi_type *args[MAX_ARGS];
+  void *values[MAX_ARGS];
+  ffi_type ts12_type,ts12b_type, ts12a_type;
+  ffi_type *ts12_type_elements[4];
+  ffi_type *ts12b_type_elements[3];
+  ffi_type *ts12a_type_elements[3];
+
+  test_structure_12 ts12_arg;
+  void (*ptr)(void)=&callback;
+
+  test_structure_12 *ts12_result =
+    (test_structure_12 *) malloc (sizeof(test_structure_12));
+
+  ts12a_type.size = 0;
+  ts12a_type.alignment = 0;
+  ts12a_type.type = FFI_TYPE_STRUCT;
+  ts12a_type.elements = ts12a_type_elements;
+  ts12a_type_elements[0] = &ffi_type_uchar;
+  ts12a_type_elements[1] = &ffi_type_double;
+  ts12a_type_elements[2] = NULL;
+
+  ts12b_type.size = 0;
+  ts12b_type.alignment = 0;
+  ts12b_type.type = FFI_TYPE_STRUCT;
+  ts12b_type.elements = ts12b_type_elements;
+  ts12b_type_elements[0] = &ffi_type_double;
+  ts12b_type_elements[1] = &ffi_type_double;
+  ts12b_type_elements[2] = NULL;
+
+  ts12_type.size = 0;
+  ts12_type.alignment = 0;
+  ts12_type.type = FFI_TYPE_STRUCT;
+  ts12_type.elements = ts12_type_elements;
+  ts12_type_elements[0] = &ts12a_type;
+  ts12_type_elements[1] = &ts12b_type;
+  ts12_type_elements[2] = &ffi_type_uchar;
+  ts12_type_elements[3] = NULL;
+
+
+  args[0] = &ts12_type;
+  args[1] = &ffi_type_pointer;
+  values[0] = &ts12_arg;
+  values[1] = &ptr;
+
+  CHECK(ffi_prep_cif(&cif, ABI_NUM, 2, &ts12_type, args) == FFI_OK);
+
+  ts12_arg.s1.c = 5;
+  ts12_arg.s1.d = 5.55;
+  ts12_arg.c2 = 6;
+  ts12_arg.s[0] = 7.77;
+  ts12_arg.s[1] = 8.88;
+
+  printf ("%d\n", ts12_arg.s1.c);
+  printf ("%g\n", ts12_arg.s1.d);
+  printf ("%u\n", ts12_arg.c2);
+  printf ("%g\n", ts12_arg.s[0]);
+  printf ("%g\n", ts12_arg.s[1]);
+  printf ("%d\n", i);
+
+  ffi_call(&cif, FFI_FN(struct12), ts12_result, values);
+
+  printf ("%d\n", ts12_result->s1.c);
+  printf ("%g\n", ts12_result->s1.d);
+  printf ("%u\n", ts12_result->c2);
+  printf ("%g\n", ts12_result->s[0]);
+  printf ("%g\n", ts12_result->s[1]);
+  printf ("%d\n", i);
+  CHECK(ts12_result->s1.c == 5 + 1);
+  CHECK(ts12_result->s1.d == 5.55 + 1);
+  CHECK(ts12_result->c2 == 6 + 1);
+  CHECK(ts12_result->s[0] == 7.77 + 1);
+  CHECK(ts12_result->s[1] == 8.88 + 1);
+  CHECK(i == 5 + 1);
+  CHECK(ts12_type.size == sizeof(test_structure_12));
+
+  free (ts12_result);
+  exit(0);
+}