Re-bindgen by rake check:bindgen

Author: kateinoigakukun

ext/js/bindgen/rb-js-abi-host.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <rb-abi-guest.h>
 
-__attribute__((weak, export_name("canonical_abi_realloc")))
-void *canonical_abi_realloc(
+__attribute__((weak, export_name("cabi_realloc")))
+void *cabi_realloc(
 void *ptr,
 size_t orig_size,
 size_t org_align,
@@ -14,15 +14,6 @@ size_t new_size
   return ret;
 }
 
-__attribute__((weak, export_name("canonical_abi_free")))
-void canonical_abi_free(
-void *ptr,
-size_t size,
-size_t align
-) {
-  free(ptr);
-}
-
 __attribute__((import_module("canonical_abi"), import_name("resource_drop_rb-iseq")))
 void __resource_rb_iseq_drop(uint32_t idx);
 
@@ -99,103 +90,114 @@ void rb_abi_guest_string_set(rb_abi_guest_string_t *ret, const char *s) {
 
 void rb_abi_guest_string_dup(rb_abi_guest_string_t *ret, const char *s) {
   ret->len = strlen(s);
-  ret->ptr = canonical_abi_realloc(NULL, 0, 1, ret->len);
+  ret->ptr = cabi_realloc(NULL, 0, 1, ret->len);
   memcpy(ret->ptr, s, ret->len);
 }
 
 void rb_abi_guest_string_free(rb_abi_guest_string_t *ret) {
-  canonical_abi_free(ret->ptr, ret->len, 1);
+  if (ret->len > 0) {
+    free(ret->ptr);
+  }
   ret->ptr = NULL;
   ret->len = 0;
 }
 void rb_abi_guest_list_string_free(rb_abi_guest_list_string_t *ptr) {
   for (size_t i = 0; i < ptr->len; i++) {
     rb_abi_guest_string_free(&ptr->ptr[i]);
   }
-  canonical_abi_free(ptr->ptr, ptr->len * 8, 4);
+  if (ptr->len > 0) {
+    free(ptr->ptr);
+  }
+}
+void rb_abi_guest_tuple2_rb_abi_value_s32_free(rb_abi_guest_tuple2_rb_abi_value_s32_t *ptr) {
+  rb_abi_guest_rb_abi_value_free(&ptr->f0);
 }
-typedef struct {
-  rb_abi_guest_rb_abi_value_t f0;
-  int32_t f1;
-} rb_abi_guest_tuple2_rb_abi_value_s32_t;
 void rb_abi_guest_list_rb_abi_value_free(rb_abi_guest_list_rb_abi_value_t *ptr) {
   for (size_t i = 0; i < ptr->len; i++) {
     rb_abi_guest_rb_abi_value_free(&ptr->ptr[i]);
   }
-  canonical_abi_free(ptr->ptr, ptr->len * 4, 4);
+  if (ptr->len > 0) {
+    free(ptr->ptr);
+  }
 }
-static int64_t RET_AREA[2];
-__attribute__((export_name("ruby-show-version")))
+
+__attribute__((aligned(4)))
+static uint8_t RET_AREA[8];
+__attribute__((export_name("ruby-show-version: func() -> ()")))
 void __wasm_export_rb_abi_guest_ruby_show_version(void) {
   rb_abi_guest_ruby_show_version();
 }
-__attribute__((export_name("ruby-init")))
+__attribute__((export_name("ruby-init: func() -> ()")))
 void __wasm_export_rb_abi_guest_ruby_init(void) {
   rb_abi_guest_ruby_init();
 }
-__attribute__((export_name("ruby-sysinit")))
+__attribute__((export_name("ruby-sysinit: func(args: list<string>) -> ()")))
 void __wasm_export_rb_abi_guest_ruby_sysinit(int32_t arg, int32_t arg0) {
   rb_abi_guest_list_string_t arg1 = (rb_abi_guest_list_string_t) { (rb_abi_guest_string_t*)(arg), (size_t)(arg0) };
   rb_abi_guest_ruby_sysinit(&arg1);
 }
-__attribute__((export_name("ruby-options")))
+__attribute__((export_name("ruby-options: func(args: list<string>) -> handle<rb-iseq>")))
 int32_t __wasm_export_rb_abi_guest_ruby_options(int32_t arg, int32_t arg0) {
   rb_abi_guest_list_string_t arg1 = (rb_abi_guest_list_string_t) { (rb_abi_guest_string_t*)(arg), (size_t)(arg0) };
   rb_abi_guest_rb_iseq_t ret = rb_abi_guest_ruby_options(&arg1);
   return (ret).idx;
 }
-__attribute__((export_name("ruby-script")))
+__attribute__((export_name("ruby-script: func(name: string) -> ()")))
 void __wasm_export_rb_abi_guest_ruby_script(int32_t arg, int32_t arg0) {
   rb_abi_guest_string_t arg1 = (rb_abi_guest_string_t) { (char*)(arg), (size_t)(arg0) };
   rb_abi_guest_ruby_script(&arg1);
 }
-__attribute__((export_name("ruby-init-loadpath")))
+__attribute__((export_name("ruby-init-loadpath: func() -> ()")))
 void __wasm_export_rb_abi_guest_ruby_init_loadpath(void) {
   rb_abi_guest_ruby_init_loadpath();
 }
-__attribute__((export_name("rb-eval-string-protect")))
+__attribute__((export_name("rb-eval-string-protect: func(str: string) -> tuple<handle<rb-abi-value>, s32>")))
 int32_t __wasm_export_rb_abi_guest_rb_eval_string_protect(int32_t arg, int32_t arg0) {
   rb_abi_guest_string_t arg1 = (rb_abi_guest_string_t) { (char*)(arg), (size_t)(arg0) };
-  rb_abi_guest_rb_abi_value_t ret;
-  int32_t ret2;
-  rb_abi_guest_rb_eval_string_protect(&arg1, &ret, &ret2);
+  rb_abi_guest_tuple2_rb_abi_value_s32_t ret;
+  rb_abi_guest_rb_eval_string_protect(&arg1, &ret);
   int32_t ptr = (int32_t) &RET_AREA;
-  *((int32_t*)(ptr + 8)) = ((rb_abi_guest_tuple2_rb_abi_value_s32_t){ ret, ret2 }).f1;
-  *((int32_t*)(ptr + 0)) = (((rb_abi_guest_tuple2_rb_abi_value_s32_t){ ret, ret2 }).f0).idx;
+  *((int32_t*)(ptr + 0)) = ((ret).f0).idx;
+  *((int32_t*)(ptr + 4)) = (ret).f1;
   return ptr;
 }
-__attribute__((export_name("rb-funcallv-protect")))
+__attribute__((export_name("rb-funcallv-protect: func(recv: handle<rb-abi-value>, mid: u32, args: list<handle<rb-abi-value>>) -> tuple<handle<rb-abi-value>, s32>")))
 int32_t __wasm_export_rb_abi_guest_rb_funcallv_protect(int32_t arg, int32_t arg0, int32_t arg1, int32_t arg2) {
   rb_abi_guest_list_rb_abi_value_t arg3 = (rb_abi_guest_list_rb_abi_value_t) { (rb_abi_guest_rb_abi_value_t*)(arg1), (size_t)(arg2) };
-  rb_abi_guest_rb_abi_value_t ret;
-  int32_t ret4;
-  rb_abi_guest_rb_funcallv_protect((rb_abi_guest_rb_abi_value_t){ arg }, (uint32_t) (arg0), &arg3, &ret, &ret4);
+  rb_abi_guest_tuple2_rb_abi_value_s32_t ret;
+  rb_abi_guest_rb_funcallv_protect((rb_abi_guest_rb_abi_value_t){ arg }, (uint32_t) (arg0), &arg3, &ret);
   int32_t ptr = (int32_t) &RET_AREA;
-  *((int32_t*)(ptr + 8)) = ((rb_abi_guest_tuple2_rb_abi_value_s32_t){ ret, ret4 }).f1;
-  *((int32_t*)(ptr + 0)) = (((rb_abi_guest_tuple2_rb_abi_value_s32_t){ ret, ret4 }).f0).idx;
+  *((int32_t*)(ptr + 0)) = ((ret).f0).idx;
+  *((int32_t*)(ptr + 4)) = (ret).f1;
   return ptr;
 }
-__attribute__((export_name("rb-intern")))
+__attribute__((export_name("rb-intern: func(name: string) -> u32")))
 int32_t __wasm_export_rb_abi_guest_rb_intern(int32_t arg, int32_t arg0) {
   rb_abi_guest_string_t arg1 = (rb_abi_guest_string_t) { (char*)(arg), (size_t)(arg0) };
   rb_abi_guest_rb_id_t ret = rb_abi_guest_rb_intern(&arg1);
   return (int32_t) (ret);
 }
-__attribute__((export_name("rb-errinfo")))
+__attribute__((export_name("rb-errinfo: func() -> handle<rb-abi-value>")))
 int32_t __wasm_export_rb_abi_guest_rb_errinfo(void) {
   rb_abi_guest_rb_abi_value_t ret = rb_abi_guest_rb_errinfo();
   return (ret).idx;
 }
-__attribute__((export_name("rb-clear-errinfo")))
+__attribute__((export_name("rb-clear-errinfo: func() -> ()")))
 void __wasm_export_rb_abi_guest_rb_clear_errinfo(void) {
   rb_abi_guest_rb_clear_errinfo();
 }
-__attribute__((export_name("rstring-ptr")))
+__attribute__((export_name("rstring-ptr: func(value: handle<rb-abi-value>) -> string")))
 int32_t __wasm_export_rb_abi_guest_rstring_ptr(int32_t arg) {
   rb_abi_guest_string_t ret;
   rb_abi_guest_rstring_ptr((rb_abi_guest_rb_abi_value_t){ arg }, &ret);
   int32_t ptr = (int32_t) &RET_AREA;
-  *((int32_t*)(ptr + 8)) = (int32_t) (ret).len;
+  *((int32_t*)(ptr + 4)) = (int32_t) (ret).len;
   *((int32_t*)(ptr + 0)) = (int32_t) (ret).ptr;
   return ptr;
 }
+__attribute__((export_name("cabi_post_rstring-ptr")))
+void __wasm_export_rb_abi_guest_rstring_ptr_post_return(int32_t arg0) {
+  if ((*((int32_t*) (arg0 + 4))) > 0) {
+    free((void*) (*((int32_t*) (arg0 + 0))));
+  }
+}

ext/witapi/bindgen/rb-abi-guest.c

@@ -45,6 +45,11 @@ extern "C"
     size_t len;
   } rb_abi_guest_list_string_t;
   void rb_abi_guest_list_string_free(rb_abi_guest_list_string_t *ptr);
+  typedef struct {
+    rb_abi_guest_rb_abi_value_t f0;
+    int32_t f1;
+  } rb_abi_guest_tuple2_rb_abi_value_s32_t;
+  void rb_abi_guest_tuple2_rb_abi_value_s32_free(rb_abi_guest_tuple2_rb_abi_value_s32_t *ptr);
   typedef struct {
     rb_abi_guest_rb_abi_value_t *ptr;
     size_t len;
@@ -56,8 +61,8 @@ extern "C"
   rb_abi_guest_rb_iseq_t rb_abi_guest_ruby_options(rb_abi_guest_list_string_t *args);
   void rb_abi_guest_ruby_script(rb_abi_guest_string_t *name);
   void rb_abi_guest_ruby_init_loadpath(void);
-  void rb_abi_guest_rb_eval_string_protect(rb_abi_guest_string_t *str, rb_abi_guest_rb_abi_value_t *ret0, int32_t *ret1);
-  void rb_abi_guest_rb_funcallv_protect(rb_abi_guest_rb_abi_value_t recv, rb_abi_guest_rb_id_t mid, rb_abi_guest_list_rb_abi_value_t *args, rb_abi_guest_rb_abi_value_t *ret0, int32_t *ret1);
+  void rb_abi_guest_rb_eval_string_protect(rb_abi_guest_string_t *str, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0);
+  void rb_abi_guest_rb_funcallv_protect(rb_abi_guest_rb_abi_value_t recv, rb_abi_guest_rb_id_t mid, rb_abi_guest_list_rb_abi_value_t *args, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0);
   rb_abi_guest_rb_id_t rb_abi_guest_rb_intern(rb_abi_guest_string_t *name);
   rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_errinfo(void);
   void rb_abi_guest_rb_clear_errinfo(void);

ext/witapi/bindgen/rb-abi-guest.h

@@ -1,16 +1,14 @@
 
-export function clamp_host(i, min, max) {
-  if (!Number.isInteger(i)) throw new TypeError(`must be an integer`);
-  if (i < min || i > max) throw new RangeError(`must be between ${min} and ${max}`);
-  return i;
-}
-
 let DATA_VIEW = new DataView(new ArrayBuffer());
 
 export function data_view(mem) {
   if (DATA_VIEW.buffer !== mem.buffer) DATA_VIEW = new DataView(mem.buffer);
   return DATA_VIEW;
 }
+
+export function to_uint32(val) {
+  return val >>> 0;
+}
 export const UTF8_DECODER = new TextDecoder('utf-8');
 
 const UTF8_ENCODER = new TextEncoder('utf-8');
@@ -82,3 +80,7 @@ export class Slab {
     return ret;
   }
 }
+
+export function throw_invalid_bool() {
+  throw new RangeError("invalid variant discriminant for bool");
+}

packages/npm-packages/ruby-wasm-wasi/src/bindgen/intrinsics.js

@@ -19,7 +19,7 @@ export class RbAbiGuest {
   */
   constructor();
 
-  /** 
+  /**
   * This is a low-level method which can be used to add any
   * intrinsics necessary for this instance to operate to an
   * import object.

packages/npm-packages/ruby-wasm-wasi/src/bindgen/rb-abi-guest.d.ts

@@ -1,4 +1,4 @@
-import { clamp_host, data_view, UTF8_DECODER, utf8_encode, UTF8_ENCODED_LEN, Slab } from './intrinsics.js';
+import { data_view, to_uint32, UTF8_DECODER, utf8_encode, UTF8_ENCODED_LEN, Slab } from './intrinsics.js';
 export class RbAbiGuest {
   constructor() {
     this._resource0_slab = new Slab();
@@ -58,14 +58,14 @@ export class RbAbiGuest {
     this._registry1 = new FinalizationRegistry(this._exports['canonical_abi_drop_rb-abi-value']);
   }
   rubyShowVersion() {
-    this._exports['ruby-show-version']();
+    this._exports['ruby-show-version: func() -> ()']();
   }
   rubyInit() {
-    this._exports['ruby-init']();
+    this._exports['ruby-init: func() -> ()']();
   }
   rubySysinit(arg0) {
     const memory = this._exports.memory;
-    const realloc = this._exports["canonical_abi_realloc"];
+    const realloc = this._exports["cabi_realloc"];
     const vec1 = arg0;
     const len1 = vec1.length;
     const result1 = realloc(0, 0, 4, len1 * 8);
@@ -77,11 +77,11 @@ export class RbAbiGuest {
       data_view(memory).setInt32(base + 4, len0, true);
       data_view(memory).setInt32(base + 0, ptr0, true);
     }
-    this._exports['ruby-sysinit'](result1, len1);
+    this._exports['ruby-sysinit: func(args: list<string>) -> ()'](result1, len1);
   }
   rubyOptions(arg0) {
     const memory = this._exports.memory;
-    const realloc = this._exports["canonical_abi_realloc"];
+    const realloc = this._exports["cabi_realloc"];
     const vec1 = arg0;
     const len1 = vec1.length;
     const result1 = realloc(0, 0, 4, len1 * 8);
@@ -93,30 +93,30 @@ export class RbAbiGuest {
       data_view(memory).setInt32(base + 4, len0, true);
       data_view(memory).setInt32(base + 0, ptr0, true);
     }
-    const ret = this._exports['ruby-options'](result1, len1);
+    const ret = this._exports['ruby-options: func(args: list<string>) -> handle<rb-iseq>'](result1, len1);
     return this._resource0_slab.remove(ret);
   }
   rubyScript(arg0) {
     const memory = this._exports.memory;
-    const realloc = this._exports["canonical_abi_realloc"];
+    const realloc = this._exports["cabi_realloc"];
     const ptr0 = utf8_encode(arg0, realloc, memory);
     const len0 = UTF8_ENCODED_LEN;
-    this._exports['ruby-script'](ptr0, len0);
+    this._exports['ruby-script: func(name: string) -> ()'](ptr0, len0);
   }
   rubyInitLoadpath() {
-    this._exports['ruby-init-loadpath']();
+    this._exports['ruby-init-loadpath: func() -> ()']();
   }
   rbEvalStringProtect(arg0) {
     const memory = this._exports.memory;
-    const realloc = this._exports["canonical_abi_realloc"];
+    const realloc = this._exports["cabi_realloc"];
     const ptr0 = utf8_encode(arg0, realloc, memory);
     const len0 = UTF8_ENCODED_LEN;
-    const ret = this._exports['rb-eval-string-protect'](ptr0, len0);
-    return [this._resource1_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 8, true)];
+    const ret = this._exports['rb-eval-string-protect: func(str: string) -> tuple<handle<rb-abi-value>, s32>'](ptr0, len0);
+    return [this._resource1_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 4, true)];
   }
   rbFuncallvProtect(arg0, arg1, arg2) {
     const memory = this._exports.memory;
-    const realloc = this._exports["canonical_abi_realloc"];
+    const realloc = this._exports["cabi_realloc"];
     const obj0 = arg0;
     if (!(obj0 instanceof RbAbiValue)) throw new TypeError('expected instance of RbAbiValue');
     const vec2 = arg2;
@@ -129,35 +129,34 @@ export class RbAbiGuest {
       if (!(obj1 instanceof RbAbiValue)) throw new TypeError('expected instance of RbAbiValue');
       data_view(memory).setInt32(base + 0, this._resource1_slab.insert(obj1.clone()), true);
     }
-    const ret = this._exports['rb-funcallv-protect'](this._resource1_slab.insert(obj0.clone()), clamp_host(arg1, 0, 4294967295), result2, len2);
-    return [this._resource1_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 8, true)];
+    const ret = this._exports['rb-funcallv-protect: func(recv: handle<rb-abi-value>, mid: u32, args: list<handle<rb-abi-value>>) -> tuple<handle<rb-abi-value>, s32>'](this._resource1_slab.insert(obj0.clone()), to_uint32(arg1), result2, len2);
+    return [this._resource1_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 4, true)];
   }
   rbIntern(arg0) {
     const memory = this._exports.memory;
-    const realloc = this._exports["canonical_abi_realloc"];
+    const realloc = this._exports["cabi_realloc"];
     const ptr0 = utf8_encode(arg0, realloc, memory);
     const len0 = UTF8_ENCODED_LEN;
-    const ret = this._exports['rb-intern'](ptr0, len0);
+    const ret = this._exports['rb-intern: func(name: string) -> u32'](ptr0, len0);
     return ret >>> 0;
   }
   rbErrinfo() {
-    const ret = this._exports['rb-errinfo']();
+    const ret = this._exports['rb-errinfo: func() -> handle<rb-abi-value>']();
     return this._resource1_slab.remove(ret);
   }
   rbClearErrinfo() {
-    this._exports['rb-clear-errinfo']();
+    this._exports['rb-clear-errinfo: func() -> ()']();
   }
   rstringPtr(arg0) {
     const memory = this._exports.memory;
-    const free = this._exports["canonical_abi_free"];
     const obj0 = arg0;
     if (!(obj0 instanceof RbAbiValue)) throw new TypeError('expected instance of RbAbiValue');
-    const ret = this._exports['rstring-ptr'](this._resource1_slab.insert(obj0.clone()));
+    const ret = this._exports['rstring-ptr: func(value: handle<rb-abi-value>) -> string'](this._resource1_slab.insert(obj0.clone()));
     const ptr1 = data_view(memory).getInt32(ret + 0, true);
-    const len1 = data_view(memory).getInt32(ret + 8, true);
-    const list1 = UTF8_DECODER.decode(new Uint8Array(memory.buffer, ptr1, len1));
-    free(ptr1, len1, 1);
-    return list1;
+    const len1 = data_view(memory).getInt32(ret + 4, true);
+    const result1 = UTF8_DECODER.decode(new Uint8Array(memory.buffer, ptr1, len1));
+    this._exports["cabi_post_rstring-ptr"](ret);
+    return result1;
   }
 }