deps,src,test: fixed failures.

Signed-off-by: Paolo Insogna <paolo@cowtech.it>

Author: ShogunPanda

deps/libffi/libffi.gyp

@@ -6,6 +6,7 @@
       'src/java_raw_api.c',
       'src/prep_cif.c',
       'src/raw_api.c',
+      'src/tramp.c',
       'src/types.c',
     ],
     'libffi_defines%': [],
@@ -137,8 +138,10 @@
             '<(python)',
             'generate-headers.py',
             '--output-dir=<(INTERMEDIATE_DIR)',
-            '--target-arch=<(target_arch)',
-            '--os=<(OS)',
+            '--target-arch',
+            '<(target_arch)',
+            '--os',
+            '<(OS)',
           ],
         },
       ],

node.gyp

@@ -999,8 +999,16 @@
               'dependencies': [
                 'deps/libffi/libffi.gyp:libffi',
               ],
-              'include_dirs': [
-                '<(PRODUCT_DIR)/obj.target/libffi/geni',
+              'conditions': [
+                [ 'OS=="win"', {
+                  'include_dirs': [
+                    '<(PRODUCT_DIR)/obj/libffi',
+                  ],
+                }, {
+                  'include_dirs': [
+                    '<(PRODUCT_DIR)/obj.target/libffi/geni',
+                  ],
+                }],
               ],
             }],
           ],
@@ -1069,8 +1077,16 @@
               'dependencies': [
                 'deps/libffi/libffi.gyp:libffi',
               ],
-              'include_dirs': [
-                '<(PRODUCT_DIR)/obj.target/libffi/geni',
+              'conditions': [
+                [ 'OS=="win"', {
+                  'include_dirs': [
+                    '<(PRODUCT_DIR)/obj/libffi',
+                  ],
+                }, {
+                  'include_dirs': [
+                    '<(PRODUCT_DIR)/obj.target/libffi/geni',
+                  ],
+                }],
               ],
             }],
           ],

src/node_ffi.cc

@@ -135,8 +135,11 @@ bool DynamicLibrary::PrepareFunction(Environment* env,
 
     *should_cache_symbol = symbols_.find(name) == symbols_.end();
 
-    fn = std::make_shared<FFIFunction>(FFIFunction{
-        .closed = false, .ptr = ptr, .args = args, .return_type = return_type});
+    fn = std::make_shared<FFIFunction>(FFIFunction{.closed = false,
+                                                   .ptr = ptr,
+                                                   .cif = {},
+                                                   .args = args,
+                                                   .return_type = return_type});
 
     ffi_status status = ffi_prep_cif(&fn->cif,
                                      FFI_DEFAULT_ABI,
@@ -669,6 +672,9 @@ void DynamicLibrary::RegisterCallback(const FunctionCallbackInfo<Value>& args) {
                                   .env = env,
                                   .thread_id = std::this_thread::get_id(),
                                   .fn = Global<Function>(isolate, fn),
+                                  .closure = nullptr,
+                                  .ptr = nullptr,
+                                  .cif = {},
                                   .args = std::move(callback_args),
                                   .return_type = return_type};
 

test/ffi/test-ffi-memory.js

@@ -5,15 +5,17 @@ const common = require('../common');
 common.skipIfFFIMissing();
 const { constants: bufferConstants } = require('node:buffer');
 const assert = require('node:assert');
-const { test } = require('node:test');
+const { after, test } = require('node:test');
 const ffi = require('node:ffi');
 const { fixtureSymbols, libraryPath } = require('./ffi-test-common');
 
-const { functions: symbols } = ffi.dlopen(libraryPath, {
+const { lib, functions: symbols } = ffi.dlopen(libraryPath, {
   allocate_memory: fixtureSymbols.allocate_memory,
   deallocate_memory: fixtureSymbols.deallocate_memory,
 });
 
+after(() => lib.close());
+
 function withAllocations(fn) {
   const allocations = new Set();
 

tools/nix/sharedLibDeps.nix

@@ -10,6 +10,7 @@
   inherit (pkgs)
     ada
     brotli
+    libffi
     gtest
     libuv
     merve
@@ -20,6 +21,7 @@
     zlib
     zstd
     ;
+  ffi = libffi;
   cares = pkgs.c-ares;
   hdr-histogram = pkgs.hdrhistogram_c;
   http-parser = pkgs.llhttp;