ffi 1.9.24 → 1.16.3

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

@@ -0,0 +1,154 @@
+/* Area:		ffi_call
+   Purpose:		Test function with multiple fixed args and variable argument list.
+   Limitations:	none.
+   PR:			none.
+   Originator:	        ARM Ltd., Oracle */
+
+/* { dg-do run } */
+/* { dg-output "" { xfail avr32*-*-* m68k-*-* } } */
+
+#include "ffitest.h"
+#include <stdarg.h>
+
+/*
+ * This is a modified version of va_2.c that has fixed arguments with "small" types that
+ * are not allowed as variable arguments, but they should be still allowed as fixed args.
+ */
+
+static int
+test_fn (char a1, float a2, int n, ...)
+{
+  va_list ap;
+  unsigned char uc;
+  signed char sc;
+  unsigned short us;
+  signed short ss;
+  unsigned int ui;
+  signed int si;
+  unsigned long ul;
+  signed long sl;
+  float f;
+  double d;
+
+  va_start (ap, n);
+
+  uc = va_arg (ap, unsigned);
+  sc = va_arg (ap, signed);
+
+  us = va_arg (ap, unsigned);
+  ss = va_arg (ap, signed);
+
+  ui = va_arg (ap, unsigned int);
+  si = va_arg (ap, signed int);
+
+  ul = va_arg (ap, unsigned long);
+  sl = va_arg (ap, signed long);
+
+  f = va_arg (ap, double);	/* C standard promotes float->double
+				   when anonymous */
+  d = va_arg (ap, double);
+
+  printf ("%d %f uc=%u sc=%d %u %d %u %d %lu %ld %f %f\n",
+	  a1, a2,
+	  uc, sc,
+	  us, ss,
+	  ui, si,
+	  ul, sl,
+	  f, d);
+
+  va_end (ap);
+
+  CHECK(a1 == 1);
+  CHECK((int)a2 == 2);
+  CHECK(uc == 9);
+  CHECK(sc == 10);
+  CHECK(us == 11);
+  CHECK(ss == 12);
+  CHECK(ui == 13);
+  CHECK(si == 14);
+  CHECK(ul == 15);
+  CHECK(sl == 16);
+  CHECK((int)f == 2);
+  CHECK((int)d == 3);
+
+  return n + 1;
+}
+
+int
+main (void)
+{
+  ffi_cif cif;
+  void* args[14];
+  ffi_type* arg_types[14];
+
+  char a1;
+  float a2;
+  int n;
+  ffi_arg res;
+
+  unsigned int uc;
+  signed int sc;
+  unsigned int us;
+  signed int ss;
+  unsigned int ui;
+  signed int si;
+  unsigned long ul;
+  signed long sl;
+  double d1;
+  double f1;
+
+  arg_types[0] = &ffi_type_schar;
+  arg_types[1] = &ffi_type_float;
+  arg_types[2] = &ffi_type_sint;
+  arg_types[3] = &ffi_type_uint;
+  arg_types[4] = &ffi_type_sint;
+  arg_types[5] = &ffi_type_uint;
+  arg_types[6] = &ffi_type_sint;
+  arg_types[7] = &ffi_type_uint;
+  arg_types[8] = &ffi_type_sint;
+  arg_types[9] = &ffi_type_ulong;
+  arg_types[10] = &ffi_type_slong;
+  arg_types[11] = &ffi_type_double;
+  arg_types[12] = &ffi_type_double;
+  arg_types[13] = NULL;
+
+  CHECK(ffi_prep_cif_var(&cif, FFI_DEFAULT_ABI, 3, 13, &ffi_type_sint, arg_types) == FFI_OK);
+
+  a1 = 1;
+  a2 = 2.0f;
+  n = 41;
+
+  uc = 9;
+  sc = 10;
+  us = 11;
+  ss = 12;
+  ui = 13;
+  si = 14;
+  ul = 15;
+  sl = 16;
+  f1 = 2.12;
+  d1 = 3.13;
+
+  args[0] = &a1;
+  args[1] = &a2;
+  args[2] = &n;
+  args[3] = &uc;
+  args[4] = &sc;
+  args[5] = &us;
+  args[6] = &ss;
+  args[7] = &ui;
+  args[8] = &si;
+  args[9] = &ul;
+  args[10] = &sl;
+  args[11] = &f1;
+  args[12] = &d1;
+  args[13] = NULL;
+
+  ffi_call(&cif, FFI_FN(test_fn), &res, args);
+  /* { dg-output "1 2.000000 uc=9 sc=10 11 12 13 14 15 16 2.120000 3.130000" } */
+  printf("res: %d\n", (int) res);
+  /* { dg-output "\nres: 42" } */
+  CHECK(res == 42);
+
+  return 0;
+}

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

@@ -40,6 +40,18 @@ test_fn (int n, ...)
   printf ("%u %u %u %u %u %u %u %u %u\n", s1.a, s1.b, l.a, l.b, l.c, l.d, l.e,
 	  s2.a, s2.b);
   va_end (ap);
+
+  CHECK(s1.a == 5);
+  CHECK(s1.b == 6);
+
+  CHECK(l.a == 10);
+  CHECK(l.b == 11);
+  CHECK(l.c == 12);
+  CHECK(l.d == 13);
+  CHECK(l.e == 14);
+
+  CHECK(s2.a == 7);
+  CHECK(s2.b == 8);
   return n + 1;
 }
 
@@ -116,6 +128,7 @@ main (void)
   /* { dg-output "5 6 10 11 12 13 14 7 8" } */
   printf("res: %d\n", (int) res);
   /* { dg-output "\nres: 42" } */
+  CHECK(res == 42);
 
   return 0;
 }

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

@@ -39,6 +39,15 @@ test_fn (int n, ...)
   s2 = va_arg (ap, struct small_tag);
   printf ("%u %u %u %u %u %u %u %u %u\n", s1.a, s1.b, l.a, l.b, l.c, l.d, l.e,
 	  s2.a, s2.b);
+  CHECK(s1.a == 5);
+  CHECK(s1.b == 6);
+  CHECK(l.a == 10);
+  CHECK(l.b == 11);
+  CHECK(l.c == 12);
+  CHECK(l.d == 13);
+  CHECK(l.e == 14);
+  CHECK(s2.a == 7);
+  CHECK(s2.b == 8);
   va_end (ap);
   s1.a += s2.a;
   s1.b += s2.b;
@@ -118,6 +127,8 @@ main (void)
   /* { dg-output "5 6 10 11 12 13 14 7 8" } */
   printf("res: %d %d\n", res.a, res.b);
   /* { dg-output "\nres: 12 14" } */
+  CHECK(res.a == 12);
+  CHECK(res.b == 14);
 
   return 0;
 }

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

@@ -39,6 +39,16 @@ test_fn (int n, ...)
   s2 = va_arg (ap, struct small_tag);
   printf ("%u %u %u %u %u %u %u %u %u\n", s1.a, s1.b, l.a, l.b, l.c, l.d, l.e,
 	  s2.a, s2.b);
+
+  CHECK(s1.a == 5);
+  CHECK(s1.b == 6);
+  CHECK(l.a == 10);
+  CHECK(l.b == 11);
+  CHECK(l.c == 12);
+  CHECK(l.d == 13);
+  CHECK(l.e == 14);
+  CHECK(s2.a == 7);
+  CHECK(s2.b == 8);
   va_end (ap);
   l.a += s1.a;
   l.b += s1.b;
@@ -120,6 +130,11 @@ main (void)
   /* { dg-output "5 6 10 11 12 13 14 7 8" } */
   printf("res: %d %d %d %d %d\n", res.a, res.b, res.c, res.d, res.e);
   /* { dg-output "\nres: 15 17 19 21 14" } */
+  CHECK(res.a == 15);
+  CHECK(res.b == 17);
+  CHECK(res.c == 19);
+  CHECK(res.d == 21);
+  CHECK(res.e == 14);
 
   return 0;
 }

data/ext/ffi_c/libffi/testsuite/libffi.closures/closure.exp

@@ -0,0 +1,67 @@
+# Copyright (C) 2003, 2006, 2009, 2010, 2014, 2019 Free Software Foundation, Inc.
+# Copyright (C) 2019 Anthony Green
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+dg-init
+libffi-init
+
+global srcdir subdir
+
+if { [string match $compiler_vendor "microsoft"] } {
+    # -wd4005  macro redefinition
+    # -wd4244  implicit conversion to type of smaller size
+    # -wd4305  truncation to smaller type
+    # -wd4477  printf %lu of uintptr_t
+    # -wd4312  implicit conversion to type of greater size
+    # -wd4311  pointer truncation to unsigned long
+    # -EHsc    C++ Exception Handling (no SEH exceptions)
+    set additional_options "-wd4005 -wd4244 -wd4305 -wd4477 -wd4312 -wd4311 -EHsc";
+} else {
+    set additional_options "";
+}
+
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.c]]
+
+if { [libffi_feature_test "#if FFI_CLOSURES"] } {
+    run-many-tests $tlist ""
+} else {
+    foreach test $tlist {
+	unsupported "$test"
+    }
+}
+
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.cc]]
+
+# No C++ for or1k
+if { [istarget "or1k-*-*"] } {
+    foreach test $tlist {
+        unsupported "$test"
+    }
+} else {
+    if { [libffi_feature_test "#if FFI_CLOSURES"] } {
+        run-many-tests $tlist  $additional_options
+    } else {
+        foreach test $tlist {
+	    unsupported "$test"
+        }
+    }
+}
+
+dg-finish
+
+# Local Variables:
+# tcl-indent-level:4
+# End:

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn0.c

@@ -38,7 +38,7 @@ closure_test_fn0(ffi_cif* cif __UNUSED__, void* resp, void** args,
 	 (int)*(int *)args[12], (int)(*(int *)args[13]),
 	 (int)(*(int *)args[14]),*(int *)args[15],
 	 (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
-
+  CHECK((int)*(ffi_arg *)resp == 680);
 }
 
 typedef int (*closure_test_type0)(unsigned long long, int, unsigned long long,
@@ -85,5 +85,6 @@ int main (void)
   /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 680" } */
-     exit(0);
+  CHECK(res == 680);
+  exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn1.c

@@ -33,6 +33,7 @@ static void closure_test_fn1(ffi_cif* cif __UNUSED__, void* resp, void** args,
 	 (int)*(int *)args[12], (int)(*(int *)args[13]),
 	 (int)(*(int *)args[14]), *(int *)args[15],
 	 (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
+  CHECK((int)*(ffi_arg *)resp == 255);
 }
 
 typedef int (*closure_test_type1)(float, float, float, float, signed short,
@@ -77,5 +78,6 @@ int main (void)
   /* { dg-output "1 2 3 4 127 5 6 8 9 10 11 12 13 19 21 1 3: 255" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 255" } */
+  CHECK(res == 255);
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn2.c

@@ -32,6 +32,7 @@ static void closure_test_fn2(ffi_cif* cif __UNUSED__, void* resp, void** args,
 	 (int)*(int *)args[12], (int)(*(float *)args[13]),
 	 (int)(*(int *)args[14]), *(int *)args[15], (int)(intptr_t)userdata,
 	 (int)*(ffi_arg *)resp);
+  CHECK((int)*(ffi_arg *)resp == 255);
 }
 
 typedef int (*closure_test_type2)(double, double, double, double, signed short,
@@ -77,5 +78,6 @@ int main (void)
   /* { dg-output "1 2 3 4 127 5 6 8 9 10 11 12 13 19 21 1 3: 255" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 255" } */
+  CHECK(res == 255);
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn3.c

@@ -31,8 +31,27 @@ static void closure_test_fn3(ffi_cif* cif __UNUSED__, void* resp, void** args,
 	  (int)(*(float *)args[10]), (int)(*(float *)args[11]),
 	  (int)*(int *)args[12], (int)(*(float *)args[13]),
 	  (int)(*(float *)args[14]), *(int *)args[15], (int)(intptr_t)userdata,
-	  (int)*(ffi_arg *)resp);
+    (int)*(ffi_arg *)resp);
 
+    CHECK((int)*(float *)args[0] == 1);
+    CHECK((int)(*(float *)args[1]) == 2);
+    CHECK((int)(*(float *)args[2]) == 3);
+    CHECK((int)(*(float *)args[3]) == 4);
+    CHECK((int)(*(float *)args[4]) == 5);
+    CHECK((int)(*(float *)args[5]) == 6);
+    CHECK((int)*(float *)args[6] == 7);
+    CHECK((int)(*(float *)args[7]) == 8);
+    CHECK((int)(*(double *)args[8]) == 9);
+    CHECK((int)*(int *)args[9] == 10);
+    CHECK((int)(*(float *)args[10]) == 11);
+    CHECK((int)(*(float *)args[11]) == 12);
+    CHECK((int)*(int *)args[12] == 13);
+    CHECK((int)(*(float *)args[13]) == 19);
+    CHECK((int)(*(float *)args[14]) == 21);
+    CHECK(*(int *)args[15] == 1);
+    CHECK((int)(intptr_t)userdata == 3);
+
+    CHECK((int)*(ffi_arg *)resp == 135);
  }
 
 typedef int (*closure_test_type3)(float, float, float, float, float, float,
@@ -78,5 +97,6 @@ int main (void)
   /* { dg-output "1 2 3 4 5 6 7 8 9 10 11 12 13 19 21 1 3: 135" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 135" } */
+  CHECK(res == 135);
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn4.c

@@ -45,6 +45,7 @@ closure_test_fn0(ffi_cif* cif __UNUSED__, void* resp, void** args,
 	 (int)*(unsigned long long *)args[14],
 	 *(int *)args[15],
 	 (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
+  CHECK((int)*(ffi_arg *)resp == 680);
 
 }
 
@@ -84,6 +85,7 @@ int main (void)
   /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 680" } */
+  CHECK(res == 680);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn5.c

@@ -44,6 +44,7 @@ closure_test_fn5(ffi_cif* cif __UNUSED__, void* resp, void** args,
 	 (int)*(unsigned long long *)args[14],
 	 *(int *)args[15],
 	 (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
+  CHECK((int)*(ffi_arg *)resp == 680);
 
 }
 
@@ -87,6 +88,7 @@ int main (void)
   /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 680" } */
+  CHECK(res == 680);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn6.c

@@ -37,6 +37,7 @@ closure_test_fn0(ffi_cif* cif __UNUSED__, void* resp, void** args,
 	 (int)*(int *)args[12], (int)(*(int *)args[13]),
 	 (int)(*(double *)args[14]), (int)(*(double *)args[15]),
 	 (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
+  CHECK((int)*(ffi_arg *)resp == 680);
 
 }
 
@@ -86,5 +87,6 @@ int main (void)
   /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 680" } */
+  CHECK(res == 680);
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_loc_fn0.c

@@ -7,9 +7,6 @@
    Originator:	<andreast@gcc.gnu.org> 20030828	 */
 
 
-
-
-/* { dg-do run } */
 #include "ffitest.h"
 
 static void
@@ -82,8 +79,11 @@ int main (void)
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, closure_loc_test_fn0,
 			 (void *) 3 /* userdata */, codeloc) == FFI_OK);
-  
-  CHECK(memcmp(pcl, codeloc, sizeof(*pcl)) == 0);
+
+#if !defined(FFI_EXEC_STATIC_TRAMP) && !defined(__EMSCRIPTEN__)
+  /* With static trampolines, the codeloc does not point to closure */
+  CHECK(memcmp(pcl, FFI_CL(codeloc), sizeof(*pcl)) == 0);
+#endif
 
   res = (*((closure_loc_test_type0)codeloc))
     (1LL, 2, 3LL, 4, 127, 429LL, 7, 8, 9.5, 10, 11, 12, 13,
@@ -91,5 +91,6 @@ int main (void)
   /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
   printf("res: %d\n",res);
   /* { dg-output "\nres: 680" } */
-     exit(0);
+  CHECK(res == 680);
+  exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_simple.c

@@ -20,6 +20,11 @@ closure_test(ffi_cif* cif __UNUSED__, void* resp, void** args, void* userdata)
 	 (int)(*(int *)args[2]), (int)(*(int *)args[3]),
          (int)*(ffi_arg *)resp);
 
+  CHECK((int)*(int *)args[0] == 0);
+  CHECK((int)*(int *)args[1] == 1);
+  CHECK((int)*(int *)args[2] == 2);
+  CHECK((int)*(int *)args[3] == 3);
+  CHECK((int)*(ffi_arg *)resp == 9);
 }
 
 typedef int (ABI_ATTR *closure_test_type0)(int, int, int, int);
@@ -50,6 +55,7 @@ int main (void)
 
   printf("res: %d\n",res);
   /* { dg-output "\nres: 9" } */
+  CHECK(res == 9);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_12byte.c

@@ -25,6 +25,17 @@ cls_struct_12byte cls_struct_12byte_fn(struct cls_struct_12byte b1,
   printf("%d %d %d %d %d %d: %d %d %d\n", b1.a, b1.b, b1.c, b2.a, b2.b, b2.c,
 	 result.a, result.b, result.c);
 
+  CHECK(b1.a == 7);
+  CHECK(b1.b == 4);
+  CHECK(b1.c == 9);
+
+  CHECK(b2.a == 1);
+  CHECK(b2.b == 5);
+  CHECK(b2.c == 3);
+
+  CHECK(result.a == 8);
+  CHECK(result.b == 9);
+  CHECK(result.c == 12);
   return result;
 }
 
@@ -78,6 +89,9 @@ int main (void)
   /* { dg-output "7 4 9 1 5 3: 8 9 12" } */
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 8 9 12" } */
+  CHECK(res_dbl.a == 8);
+  CHECK(res_dbl.b == 9);
+  CHECK(res_dbl.c == 12);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_12byte_gn, NULL, code) == FFI_OK);
 
@@ -87,8 +101,12 @@ int main (void)
 
   res_dbl = ((cls_struct_12byte(*)(cls_struct_12byte, cls_struct_12byte))(code))(h_dbl, j_dbl);
   /* { dg-output "\n7 4 9 1 5 3: 8 9 12" } */
+
   printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 8 9 12" } */
+  CHECK(res_dbl.a == 8);
+  CHECK(res_dbl.b == 9);
+  CHECK(res_dbl.c == 12);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_16byte.c

@@ -26,6 +26,19 @@ cls_struct_16byte cls_struct_16byte_fn(struct cls_struct_16byte b1,
   printf("%d %g %d %d %g %d: %d %g %d\n", b1.a, b1.b, b1.c, b2.a, b2.b, b2.c,
 	 result.a, result.b, result.c);
 
+  CHECK(b1.a == 7);
+  CHECK(b1.b == 8);
+  CHECK(b1.c == 9);
+
+  CHECK(b2.a == 1);
+  CHECK(b2.b == 9);
+  CHECK(b2.c == 3);
+
+  CHECK(result.a == 8);
+  CHECK(result.b == 17);
+  CHECK(result.c == 12);
+
+
   return result;
 }
 
@@ -80,6 +93,10 @@ int main (void)
   printf("res: %d %g %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 8 17 12" } */
 
+  CHECK(res_dbl.a == 8);
+  CHECK(res_dbl.b == 17);
+  CHECK(res_dbl.c == 12);
+
   res_dbl.a = 0;
   res_dbl.b = 0.0;
   res_dbl.c = 0;
@@ -91,5 +108,10 @@ int main (void)
   printf("res: %d %g %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
   /* { dg-output "\nres: 8 17 12" } */
 
+  CHECK(res_dbl.a == 8);
+  CHECK(res_dbl.b == 17);
+  CHECK(res_dbl.c == 12);
+
+
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_18byte.c

@@ -29,6 +29,22 @@ cls_struct_18byte cls_struct_18byte_fn(struct cls_struct_18byte a1,
   printf("%g %d %d %g %g %d %d %g: %g %d %d %g\n", a1.a, a1.b, a1.c, a1.d,
 	 a2.a, a2.b, a2.c, a2.d,
 	 result.a, result.b, result.c, result.d);
+
+  CHECK(a1.a == 1);
+  CHECK(a1.b == 127);
+  CHECK(a1.c == 126);
+  CHECK(a1.d == 3);
+
+  CHECK(a2.a == 4);
+  CHECK(a2.b == 125);
+  CHECK(a2.c == 124);
+  CHECK(a2.d == 5);
+
+  CHECK(result.a == 5);
+  CHECK(result.b == 252);
+  CHECK(result.c == 250);
+  CHECK(result.d == 8);
+
   return result;
 }
 
@@ -84,6 +100,10 @@ int main (void)
   /* { dg-output "1 127 126 3 4 125 124 5: 5 252 250 8" } */
   printf("res: %g %d %d %g\n", res_dbl.a, res_dbl.b, res_dbl.c, res_dbl.d);
   /* { dg-output "\nres: 5 252 250 8" } */
+  CHECK(res_dbl.a == 5);
+  CHECK(res_dbl.b == 252);
+  CHECK(res_dbl.c == 250);
+  CHECK(res_dbl.d == 8);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_18byte_gn, NULL, code) == FFI_OK);
 
@@ -91,6 +111,10 @@ int main (void)
   /* { dg-output "\n1 127 126 3 4 125 124 5: 5 252 250 8" } */
   printf("res: %g %d %d %g\n", res_dbl.a, res_dbl.b, res_dbl.c, res_dbl.d);
   /* { dg-output "\nres: 5 252 250 8" } */
+  CHECK(res_dbl.a == 5);
+  CHECK(res_dbl.b == 252);
+  CHECK(res_dbl.c == 250);
+  CHECK(res_dbl.d == 8);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_19byte.c

@@ -32,6 +32,25 @@ cls_struct_19byte cls_struct_19byte_fn(struct cls_struct_19byte a1,
 	 a1.a, a1.b, a1.c, a1.d, a1.e,
 	 a2.a, a2.b, a2.c, a2.d, a2.e,
 	 result.a, result.b, result.c, result.d, result.e);
+
+  CHECK(a1.a == 1);
+  CHECK(a1.b == 127);
+  CHECK(a1.c == 126);
+  CHECK(a1.d == 3);
+  CHECK(a1.e == 120);
+
+  CHECK(a2.a == 4);
+  CHECK(a2.b == 125);
+  CHECK(a2.c == 124);
+  CHECK(a2.d == 5);
+  CHECK(a2.e == 119);
+
+  CHECK(result.a == 5);
+  CHECK(result.b == 252);
+  CHECK(result.c == 250);
+  CHECK(result.d == 8);
+  CHECK(result.e == 239);
+
   return result;
 }
 
@@ -89,6 +108,11 @@ int main (void)
   printf("res: %g %d %d %g %d\n", res_dbl.a, res_dbl.b, res_dbl.c,
 	 res_dbl.d, res_dbl.e);
   /* { dg-output "\nres: 5 252 250 8 239" } */
+  CHECK(res_dbl.a == 5);
+  CHECK(res_dbl.b == 252);
+  CHECK(res_dbl.c == 250);
+  CHECK(res_dbl.d == 8);
+  CHECK(res_dbl.e == 239);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_19byte_gn, NULL, code) == FFI_OK);
 
@@ -97,6 +121,11 @@ int main (void)
   printf("res: %g %d %d %g %d\n", res_dbl.a, res_dbl.b, res_dbl.c,
 	 res_dbl.d, res_dbl.e);
   /* { dg-output "\nres: 5 252 250 8 239" } */
+  CHECK(res_dbl.a == 5);
+  CHECK(res_dbl.b == 252);
+  CHECK(res_dbl.c == 250);
+  CHECK(res_dbl.d == 8);
+  CHECK(res_dbl.e == 239);
 
   exit(0);
 }

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_1_1byte.c

@@ -23,6 +23,9 @@ cls_struct_1_1byte cls_struct_1_1byte_fn(struct cls_struct_1_1byte a1,
   result.a = a1.a + a2.a;
 
   printf("%d %d: %d\n", a1.a, a2.a, result.a);
+  CHECK(a1.a == 12);
+  CHECK(a2.a == 178);
+  CHECK(result.a == 190);
 
   return  result;
 }
@@ -84,6 +87,7 @@ int main (void)
   /* { dg-output "\n12 178: 190" } */
   printf("res: %d\n", res_dbl.a);
   /* { dg-output "\nres: 190" } */
+  CHECK(res_dbl.a == 190);
 
   exit(0);
 }