ffi 1.16.3 → 1.17.0

data/ext/ffi_c/Struct.c

@@ -91,6 +91,7 @@ VALUE rbffi_StructLayoutCharArrayClass = Qnil;
 
 static ID id_pointer_ivar = 0, id_layout_ivar = 0;
 static ID id_get = 0, id_put = 0, id_to_ptr = 0, id_to_s = 0, id_layout = 0;
+static ID id_initialize = 0;
 
 static inline char*
 memory_address(VALUE self)
@@ -114,6 +115,7 @@ struct_allocate(VALUE klass)
 
 /*
  * call-seq: initialize
+ * @overload initialize
  * @overload initialize(pointer, *args)
  *  @param [AbstractMemory] pointer
  *  @param [Array] args
@@ -616,7 +618,7 @@ inline_array_initialize(VALUE self, VALUE rbMemory, VALUE rbField)
 
 /*
  * call-seq: size
- * @return [Numeric]
+ * @return [Integer]
  * Get size
  */
 static VALUE
@@ -641,7 +643,7 @@ inline_array_offset(InlineArray* array, int index)
 
 /*
  * call-seq: [](index)
- * @param [Numeric] index
+ * @param [Integer] index
  * @return [Type, Struct]
  */
 static VALUE
@@ -665,8 +667,12 @@ inline_array_aref(VALUE self, VALUE rbIndex)
         VALUE rbOffset = INT2NUM(inline_array_offset(array, NUM2INT(rbIndex)));
         VALUE rbLength = INT2NUM(array->componentType->ffiType->size);
         VALUE rbPointer = rb_funcall(array->rbMemory, rb_intern("slice"), 2, rbOffset, rbLength);
+        VALUE obj;
 
-        return rb_class_new_instance(1, &rbPointer, ((StructByValue *) array->componentType)->rbStructClass);
+         /* We avoid rb_class_new_instance here, to avoid passing the method block */
+         obj = rb_obj_alloc(((StructByValue *) array->componentType)->rbStructClass);
+         rb_funcallv(obj, id_initialize, 1, &rbPointer);
+         return obj;
     } else {
 
         rb_raise(rb_eArgError, "get not supported for %s", rb_obj_classname(array->arrayType->rbComponentType));
@@ -676,7 +682,7 @@ inline_array_aref(VALUE self, VALUE rbIndex)
 
 /*
  * call-seq: []=(index, value)
- * @param [Numeric] index
+ * @param [Integer] index
  * @param [Type, Struct]
  * @return [value]
  */
@@ -893,5 +899,6 @@ rbffi_Struct_Init(VALUE moduleFFI)
     id_put = rb_intern("put");
     id_to_ptr = rb_intern("to_ptr");
     id_to_s = rb_intern("to_s");
+    id_initialize = rb_intern("initialize");
 }
 

data/ext/ffi_c/StructLayout.c

@@ -132,7 +132,7 @@ struct_field_memsize(const void *data)
 /*
  * call-seq: initialize(name, offset, type)
  * @param [String,Symbol] name
- * @param [Fixnum] offset
+ * @param [Integer] offset
  * @param [FFI::Type] type
  * @return [self]
  * A new FFI::StructLayout::Field instance.
@@ -188,7 +188,7 @@ struct_field_initialize(int argc, VALUE* argv, VALUE self)
 
 /*
  * call-seq: offset
- * @return [Numeric]
+ * @return [Integer]
  * Get the field offset.
  */
 static VALUE
@@ -201,7 +201,7 @@ struct_field_offset(VALUE self)
 
 /*
  * call-seq: size
- * @return [Numeric]
+ * @return [Integer]
  * Get the field size.
  */
 static VALUE
@@ -214,7 +214,7 @@ struct_field_size(VALUE self)
 
 /*
  * call-seq: alignment
- * @return [Numeric]
+ * @return [Integer]
  * Get the field alignment.
  */
 static VALUE
@@ -460,9 +460,9 @@ struct_layout_allocate(VALUE klass)
     VALUE obj;
 
     obj = TypedData_Make_Struct(klass, StructLayout, &rbffi_struct_layout_data_type, layout);
-    layout->rbFieldMap = Qnil;
-    layout->rbFieldNames = Qnil;
-    layout->rbFields = Qnil;
+    RB_OBJ_WRITE(obj, &layout->rbFieldMap, Qnil);
+    RB_OBJ_WRITE(obj, &layout->rbFieldNames, Qnil);
+    RB_OBJ_WRITE(obj, &layout->rbFields, Qnil);
     layout->base.ffiType = xcalloc(1, sizeof(*layout->base.ffiType));
     layout->base.ffiType->size = 0;
     layout->base.ffiType->alignment = 0;
@@ -474,8 +474,8 @@ struct_layout_allocate(VALUE klass)
 /*
  * call-seq: initialize(fields, size, align)
  * @param [Array<StructLayout::Field>] fields
- * @param [Numeric] size
- * @param [Numeric] align
+ * @param [Integer] size
+ * @param [Integer] align
  * @return [self]
  * A new StructLayout instance.
  */
@@ -487,14 +487,14 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
     int i;
 
     TypedData_Get_Struct(self, StructLayout, &rbffi_struct_layout_data_type, layout);
-    layout->fieldCount = (int) RARRAY_LEN(fields);
-    layout->rbFieldMap = rb_hash_new();
-    layout->rbFieldNames = rb_ary_new2(layout->fieldCount);
+    layout->fieldCount = RARRAY_LENINT(fields);
+    RB_OBJ_WRITE(self, &layout->rbFieldMap, rb_hash_new());
+    RB_OBJ_WRITE(self, &layout->rbFieldNames, rb_ary_new2(layout->fieldCount));
     layout->size = (int) FFI_ALIGN(NUM2INT(size),  NUM2INT(align));
     layout->align = NUM2INT(align);
     layout->fields = xcalloc(layout->fieldCount, sizeof(StructField *));
     layout->ffiTypes = xcalloc(layout->fieldCount + 1, sizeof(ffi_type *));
-    layout->rbFields = rb_ary_new2(layout->fieldCount);
+    RB_OBJ_WRITE(self, &layout->rbFields, rb_ary_new2(layout->fieldCount));
     layout->referenceFieldCount = 0;
     layout->base.ffiType->elements = layout->ffiTypes;
     layout->base.ffiType->size = layout->size;

data/ext/ffi_c/Type.c

@@ -107,7 +107,7 @@ type_allocate(VALUE klass)
 /*
  * Document-method: initialize
  * call-seq: initialize(value)
- * @param [Fixnum,Type] value
+ * @param [Integer,Type] value
  * @return [self]
  */
 static VALUE
@@ -135,7 +135,7 @@ type_initialize(VALUE self, VALUE value)
 
 /*
  * call-seq: type.size
- * @return [Fixnum]
+ * @return [Integer]
  * Return type's size, in bytes.
  */
 static VALUE
@@ -150,7 +150,7 @@ type_size(VALUE self)
 
 /*
  * call-seq: type.alignment
- * @return [Fixnum]
+ * @return [Integer]
  * Get Type alignment.
  */
 static VALUE
@@ -333,10 +333,10 @@ rbffi_Type_Init(VALUE moduleFFI)
     classBuiltinType = rb_define_class_under(rbffi_TypeClass, "Builtin", rbffi_TypeClass);
     /*
      * Document-module: FFI::NativeType
-     * This module defines constants for native (C) types.
+     * This module defines constants for C native types.
      *
      * ==Native type constants
-     * Native types are defined by constants :
+     * Native types are defined by constants and aliases:
      * * INT8, SCHAR, CHAR
      * * UINT8, UCHAR
      * * INT16, SHORT, SSHORT
@@ -349,24 +349,25 @@ rbffi_Type_Init(VALUE moduleFFI)
      * * ULONG
      * * FLOAT32, FLOAT
      * * FLOAT64, DOUBLE
+     * * LONGDOUBLE (if the native platform has `long double`)
      * * POINTER
-     * * CALLBACK
-     * * FUNCTION
-     * * CHAR_ARRAY
      * * BOOL
-     * * STRING (immutable string, nul terminated)
-     * * STRUCT (struct-b-value param or result)
-     * * ARRAY (array type definition)
-     * * MAPPED (custom native type)
-     * For function return type only :
+     * * STRING (immutable string, null terminated)
+     * For function return type only:
      * * VOID
-     * For function argument type only :
+     * For function argument type only:
      * * BUFFER_IN
      * * BUFFER_OUT
+     * * BUFFER_INOUT
      * * VARARGS (function takes a variable number of arguments)
      *
-     * All these constants are exported to {FFI} module prefixed with "TYPE_".
-     * They are objets from {FFI::Type::Builtin} class.
+     * They are objects of the class {FFI::Type::Builtin}.
+     *
+     * Non-alias (the first name in each bullet point) constants are also exported to modules +FFI::NativeType+ and (prefixed with +TYPE_+) {FFI}.
+     * All constants and aliases above are exported to the {FFI::Type} class, as well as the following aliases:
+     * * Array ({FFI::ArrayType})
+     * * Function ({FFI::FunctionType})
+     * * Struct ({FFI::StructByValue})
      */
     moduleNativeType = rb_define_module_under(moduleFFI, "NativeType");
 

data/ext/ffi_c/Types.c

@@ -41,6 +41,7 @@
 #include "LongDouble.h"
 
 static ID id_from_native = 0;
+static ID id_initialize = 0;
 
 
 VALUE
@@ -95,6 +96,7 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
         case NATIVE_STRUCT: {
             StructByValue* sbv = (StructByValue *)type;
             AbstractMemory* mem;
+            VALUE obj;
             VALUE rbMemory = rbffi_MemoryPointer_NewInstance(1, sbv->base.ffiType->size, false);
 
             TypedData_Get_Struct(rbMemory, AbstractMemory, &rbffi_abstract_memory_data_type, mem);
@@ -102,7 +104,10 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
             RB_GC_GUARD(rbMemory);
             RB_GC_GUARD(rbType);
 
-            return rb_class_new_instance(1, &rbMemory, sbv->rbStructClass);
+            /* We avoid rb_class_new_instance here, to avoid passing the method block */
+            obj = rb_obj_alloc(sbv->rbStructClass);
+            rb_funcallv(obj, id_initialize, 1, &rbMemory);
+            return obj;
         }
 
         case NATIVE_MAPPED: {
@@ -134,5 +139,6 @@ void
 rbffi_Types_Init(VALUE moduleFFI)
 {
     id_from_native = rb_intern("from_native");
+    id_initialize = rb_intern("initialize");
 }
 

data/ext/ffi_c/Types.h

@@ -55,7 +55,6 @@ typedef enum {
     NATIVE_BUFFER_IN,
     NATIVE_BUFFER_OUT,
     NATIVE_BUFFER_INOUT,
-    NATIVE_CHAR_ARRAY,
     NATIVE_BOOL,
 
     /** An immutable string.  Nul terminated, but only copies in to the native function */

data/ext/ffi_c/Variadic.c

@@ -202,6 +202,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     Type** paramTypes;
     VALUE* argv;
     VALUE* callbackParameters;
+    VALUE callbackProc;
     int paramCount = 0, fixedCount = 0, callbackCount = 0, i;
     ffi_status ffiStatus;
     rbffi_frame_t frame = { 0 };
@@ -210,7 +211,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     Check_Type(parameterValues, T_ARRAY);
 
     TypedData_Get_Struct(self, VariadicInvoker, &variadic_data_type, invoker);
-    paramCount = (int) RARRAY_LEN(parameterTypes);
+    paramCount = RARRAY_LENINT(parameterTypes);
     paramTypes = ALLOCA_N(Type *, paramCount);
     ffiParamTypes = ALLOCA_N(ffi_type *, paramCount);
     params = ALLOCA_N(FFIStorage, paramCount);
@@ -290,8 +291,9 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
             rb_raise(rb_eArgError, "Unknown FFI error");
     }
 
-    rbffi_SetupCallParams(paramCount, argv, -1, paramTypes, params,
-        ffiValues, callbackParameters, callbackCount, invoker->rbEnums);
+    callbackProc = rbffi_SetupCallParams(paramCount, argv, -1, paramTypes, params,
+        ffiValues, callbackParameters, callbackCount,
+        invoker->rbEnums);
 
     rbffi_frame_push(&frame);
 
@@ -309,6 +311,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     } else {
         ffi_call(&cif, FFI_FN(invoker->function), retval, ffiValues);
     }
+    RB_GC_GUARD(callbackProc);
 
     rbffi_frame_pop(&frame);
 

data/ext/ffi_c/libffi/.github/workflows/build.yml

@@ -14,6 +14,30 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
 
+  build-warp:
+    name: ${{ matrix.HOST }} ${{ matrix.CONFIGURE_OPTIONS }} ${{ matrix.MEVAL }} ${{ matrix.LIBFFI_TEST_OPTIMIZATION }}
+    runs-on: warp-ubuntu-latest-arm64-2x
+
+    strategy:
+      fail-fast: false
+      matrix:
+       include:
+         - HOST: "aarch64-linux-gnu"
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - env:
+          MEVAL: ${{ matrix.MEVAL }}
+          HOST: ${{ matrix.HOST }}
+          LDFLAGS: ${{ matrix.LDFLAGS }}
+          RUNTESTFLAGS: ${{ matrix.RUNTESTFLAGS }}
+          CONFIGURE_OPTIONS: ${{ matrix.CONFIGURE_OPTIONS }}
+        run: |
+          if test x"$MEVAL" != x; then eval ${MEVAL}; fi
+          ./.ci/install.sh
+          ./.ci/build.sh
+
   build-sim:
     name: ${{ matrix.HOST }} ${{ matrix.CONFIGURE_OPTIONS }} ${{ matrix.MEVAL }} ${{ matrix.LIBFFI_TEST_OPTIMIZATION }}
     runs-on: ubuntu-latest
@@ -89,57 +113,52 @@ jobs:
       fail-fast: false
       matrix:
        include:
-         - CFARM_HOST: gcc117.fsffrance.org
+         - CFARM_HOST: cfarm185.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: aarch64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc117.fsffrance.org
-           CFARM_PORT: 22
-           CFARM_TRIPLE: aarch64-linux-gnu
-           CFARM_CC: "/home/green/gcc12/bin/gcc"
-           CFARM_CXX: "/home/green/gcc12/bin/g++"
-         - CFARM_HOST: gcc117.fsffrance.org
+         - CFARM_HOST: cfarm185.fsffrance.org
            CFARM_PORT: 22
            CFARM_TRIPLE: aarch64-lto-linux-gnu
            CFARM_CC: "gcc -flto"
            CFARM_CXX: "g++ -flto"
-         - CFARM_HOST: gcc400.fsffrance.org
+         - CFARM_HOST: cfarm400.cfarm.net
            CFARM_PORT: 25465
            CFARM_TRIPLE: loongarch64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc230.fsffrance.org
+         - CFARM_HOST: cfarm230.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: mips-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc102.fsffrance.org
+         - CFARM_HOST: cfarm211.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: sparc64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc102.fsffrance.org
+         - CFARM_HOST: cfarm211.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: sparc64-linux-gnu
            CFARM_CC: "gcc -m32"
            CFARM_CXX: "g++ -m32"
-         - CFARM_HOST: gcc91.fsffrance.org
+         - CFARM_HOST: cfarm91.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: riscv64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc103.fsffrance.org
+         - CFARM_HOST: cfarm103.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: aarch64-m1-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc112.fsffrance.org
+         - CFARM_HOST: cfarm112.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: powerpc64le-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc111.fsffrance.org
+         - CFARM_HOST: cfarm111.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: powerpc-ibm-aix7.1.5.0
            CFARM_CC: "gcc"

data/ext/ffi_c/libffi/.github/workflows/emscripten.yml

@@ -129,7 +129,8 @@ jobs:
     strategy:
       matrix:
         bigint: ["--wasm-bigint", ""]
-        browser: ["firefox", "chrome"]
+        browser: ["chrome"]
+        # FIXME: selenium can't find gecko driver for "firefox"
     runs-on: ubuntu-22.04
     needs: [build]
     steps:

data/ext/ffi_c/libffi/LICENSE

@@ -1,4 +1,4 @@
-libffi - Copyright (c) 1996-2022  Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2024  Anthony Green, Red Hat, Inc and others.
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/ext/ffi_c/libffi/README.md

@@ -1,7 +1,7 @@
 Status
 ======
 
-libffi-3.4.4 was released on October 23, 2022.  Check the libffi web
+libffi-3.4.6 was released on February 18, 2024.  Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
@@ -158,7 +158,7 @@ It's also possible to build libffi on Windows platforms with
 Microsoft's Visual C++ compiler.  In this case, use the msvcc.sh
 wrapper script during configuration like so:
 
-    path/to/configure CC=path/to/msvcc.sh CXX=path/to/msvcc.sh LD=link CPP="cl -nologo -EP" CPPFLAGS="-DFFI_BUILDING_DLL"
+    path/to/configure CC=path/to/msvcc.sh CXX=path/to/msvcc.sh LD=link CPP="cl -nologo -EP" CXXCPP="cl -nologo -EP" CPPFLAGS="-DFFI_BUILDING_DLL"
 
 For 64-bit Windows builds, use ``CC="path/to/msvcc.sh -m64"`` and
 ``CXX="path/to/msvcc.sh -m64"``.  You may also need to specify
@@ -201,11 +201,16 @@ History
 
 See the git log for details at http://github.com/libffi/libffi.
 
-    TBD - TBD
+    3.4.6 Feb-18-2024
+        Fix long double regression on mips64 and alpha.
+
+    3.4.5 Feb-15-2024
         Add support for wasm32.
-        Add support for HPPA64, and many HPPA fixes.
+        Add support for aarch64 branch target identification (bti).
         Add support for ARCv3: ARC32 & ARC64.
-        Many x86 Darwin fixes.
+        Add support for HPPA64, and many HPPA fixes.
+        Add support for Haikuos on PowerPC.
+        Fixes for AIX, loongson, MIPS, power, sparc64, and x86 Darwin.
 
     3.4.4 Oct-23-2022
         Important aarch64 fixes, including support for linux builds

data/ext/ffi_c/libffi/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libffi 3.4.4.
+# Generated by GNU Autoconf 2.71 for libffi 3.4.6.
 #
 # Report bugs to <http://github.com/libffi/libffi/issues>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libffi'
 PACKAGE_TARNAME='libffi'
-PACKAGE_VERSION='3.4.4'
-PACKAGE_STRING='libffi 3.4.4'
+PACKAGE_VERSION='3.4.6'
+PACKAGE_STRING='libffi 3.4.6'
 PACKAGE_BUGREPORT='http://github.com/libffi/libffi/issues'
 PACKAGE_URL=''
 
@@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libffi 3.4.4 to adapt to many kinds of systems.
+\`configure' configures libffi 3.4.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1484,7 +1484,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libffi 3.4.4:";;
+     short | recursive ) echo "Configuration of libffi 3.4.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1620,7 +1620,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libffi configure 3.4.4
+libffi configure 3.4.6
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2194,7 +2194,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libffi $as_me 3.4.4, which was
+It was created by libffi $as_me 3.4.6, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3913,7 +3913,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libffi'
- VERSION='3.4.4'
+ VERSION='3.4.6'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5556,11 +5556,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5602,11 +5602,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19523,7 +19523,7 @@ else $as_nop
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
-  	    if $EGREP '(\.hidden|\.private_extern).*foo' conftest.s >/dev/null; then
+  	    if $EGREP '(\.hidden|\.private_extern).*foo|foo.*,hidden' conftest.s >/dev/null; then
   		libffi_cv_hidden_visibility_attribute=yes
   	    fi
   	fi
@@ -20588,7 +20588,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libffi $as_me 3.4.4, which was
+This file was extended by libffi $as_me 3.4.6, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20656,7 +20656,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-libffi config.status 3.4.4
+libffi config.status 3.4.6
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

data/ext/ffi_c/libffi/configure.ac

@@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure
 
 AC_PREREQ([2.71])
 
-AC_INIT([libffi],[3.4.4],[http://github.com/libffi/libffi/issues])
+AC_INIT([libffi],[3.4.6],[http://github.com/libffi/libffi/issues])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_TARGET
@@ -298,7 +298,7 @@ if test "x$GCC" = "xyes"; then
   	echo 'int __attribute__ ((visibility ("hidden"))) foo (void) { return 1  ; }' > conftest.c
   	libffi_cv_hidden_visibility_attribute=no
   	if AC_TRY_COMMAND(${CC-cc} -Werror -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD); then
-  	    if $EGREP '(\.hidden|\.private_extern).*foo' conftest.s >/dev/null; then
+  	    if $EGREP '(\.hidden|\.private_extern).*foo|foo.*,hidden' conftest.s >/dev/null; then
   		libffi_cv_hidden_visibility_attribute=yes
   	    fi
   	fi

data/ext/ffi_c/libffi/configure.host

@@ -205,7 +205,7 @@ case "${host}" in
   powerpc-*-eabi*)
 	TARGET=POWERPC; TARGETDIR=powerpc
 	;;
-  powerpc-*-beos*)
+  powerpc-*-beos* | powerpc-*-haiku*)
 	TARGET=POWERPC; TARGETDIR=powerpc
 	;;
   powerpc-*-darwin* | powerpc64-*-darwin*)

data/ext/ffi_c/libffi/doc/libffi.texi

@@ -18,7 +18,7 @@
 This manual is for libffi, a portable foreign function interface
 library.
 
-Copyright @copyright{} 2008--2019, 2021, 2022 Anthony Green and Red Hat, Inc.
+Copyright @copyright{} 2008--2024 Anthony Green and Red Hat, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/ext/ffi_c/libffi/doc/version.texi

@@ -1,4 +1,4 @@
-@set UPDATED 23 October 2022
-@set UPDATED-MONTH October 2022
-@set EDITION 3.4.4
-@set VERSION 3.4.4
+@set UPDATED 15 February 2024
+@set UPDATED-MONTH February 2024
+@set EDITION 3.4.6
+@set VERSION 3.4.6

data/ext/ffi_c/libffi/include/ffi.h.in

@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------*-C-*-
    libffi @VERSION@
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -220,21 +220,12 @@ FFI_EXTERN ffi_type ffi_type_sint64;
 FFI_EXTERN ffi_type ffi_type_float;
 FFI_EXTERN ffi_type ffi_type_double;
 FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if @HAVE_LONG_DOUBLE@
 FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
 FFI_EXTERN ffi_type ffi_type_complex_float;
 FFI_EXTERN ffi_type ffi_type_complex_double;
-#if @HAVE_LONG_DOUBLE@
 FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
 #endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
@@ -464,7 +455,7 @@ ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
 
 #endif /* FFI_CLOSURES */
 
-#if FFI_GO_CLOSURES
+#ifdef FFI_GO_CLOSURES
 
 typedef struct {
   void      *tramp;