Stop using WIT's resource

because handles and resources support were already removed in the main
branch of wit-bindgen
bytecodealliance/wit-bindgen#346

Author: kateinoigakukun

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

@@ -8,12 +8,6 @@ extern "C"
   #include <stdint.h>
   #include <stdbool.h>
 
-  typedef struct {
-    uint32_t idx;
-  } rb_js_abi_host_js_abi_value_t;
-  void rb_js_abi_host_js_abi_value_free(rb_js_abi_host_js_abi_value_t *ptr);
-  rb_js_abi_host_js_abi_value_t rb_js_abi_host_js_abi_value_clone(rb_js_abi_host_js_abi_value_t *ptr);
-  
   typedef struct {
     char *ptr;
     size_t len;
@@ -22,6 +16,10 @@ extern "C"
   void rb_js_abi_host_string_set(rb_js_abi_host_string_t *ret, const char *s);
   void rb_js_abi_host_string_dup(rb_js_abi_host_string_t *ret, const char *s);
   void rb_js_abi_host_string_free(rb_js_abi_host_string_t *ret);
+  // A JavaScript value. In the future, this will be replaced by handle types.
+  // The underlying value should be owned by the JavaScript host environment
+  // and should live at least until all handles to it are dropped.
+  typedef uint32_t rb_js_abi_host_js_abi_value_t;
   typedef struct {
     uint8_t tag;
     union {
@@ -31,7 +29,6 @@ extern "C"
   } rb_js_abi_host_js_abi_result_t;
   #define RB_JS_ABI_HOST_JS_ABI_RESULT_SUCCESS 0
   #define RB_JS_ABI_HOST_JS_ABI_RESULT_FAILURE 1
-  void rb_js_abi_host_js_abi_result_free(rb_js_abi_host_js_abi_result_t *ptr);
   typedef struct {
     uint8_t tag;
     union {

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

@@ -1,4 +1,7 @@
-resource js-abi-value
+/// A JavaScript value. In the future, this will be replaced by handle types.
+/// The underlying value should be owned by the JavaScript host environment
+/// and should live at least until all handles to it are dropped.
+type js-abi-value = u32
 
 variant js-abi-result {
     success(js-abi-value),

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

@@ -13,74 +13,6 @@ size_t new_size
   abort();
   return ret;
 }
-
-__attribute__((import_module("canonical_abi"), import_name("resource_drop_rb-iseq")))
-void __resource_rb_iseq_drop(uint32_t idx);
-
-void rb_abi_guest_rb_iseq_free(rb_abi_guest_rb_iseq_t *ptr) {
-  __resource_rb_iseq_drop(ptr->idx);
-}
-
-__attribute__((import_module("canonical_abi"), import_name("resource_clone_rb-iseq")))
-uint32_t __resource_rb_iseq_clone(uint32_t idx);
-
-rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_clone(rb_abi_guest_rb_iseq_t *ptr) {
-  return (rb_abi_guest_rb_iseq_t){__resource_rb_iseq_clone(ptr->idx)};
-}
-
-__attribute__((import_module("canonical_abi"), import_name("resource_new_rb-iseq")))
-uint32_t __resource_rb_iseq_new(uint32_t val);
-
-rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_new(void *data) {
-  return (rb_abi_guest_rb_iseq_t){__resource_rb_iseq_new((uint32_t) data)};
-}
-
-__attribute__((import_module("canonical_abi"), import_name("resource_get_rb-iseq")))
-uint32_t __resource_rb_iseq_get(uint32_t idx);
-
-void* rb_abi_guest_rb_iseq_get(rb_abi_guest_rb_iseq_t *ptr) {
-  return (void*) __resource_rb_iseq_get(ptr->idx);
-}
-
-__attribute__((export_name("canonical_abi_drop_rb-iseq")))
-void __resource_rb_iseq_dtor(uint32_t val) {
-  if (rb_abi_guest_rb_iseq_dtor)
-  rb_abi_guest_rb_iseq_dtor((void*) val);
-}
-
-__attribute__((import_module("canonical_abi"), import_name("resource_drop_rb-abi-value")))
-void __resource_rb_abi_value_drop(uint32_t idx);
-
-void rb_abi_guest_rb_abi_value_free(rb_abi_guest_rb_abi_value_t *ptr) {
-  __resource_rb_abi_value_drop(ptr->idx);
-}
-
-__attribute__((import_module("canonical_abi"), import_name("resource_clone_rb-abi-value")))
-uint32_t __resource_rb_abi_value_clone(uint32_t idx);
-
-rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_abi_value_clone(rb_abi_guest_rb_abi_value_t *ptr) {
-  return (rb_abi_guest_rb_abi_value_t){__resource_rb_abi_value_clone(ptr->idx)};
-}
-
-__attribute__((import_module("canonical_abi"), import_name("resource_new_rb-abi-value")))
-uint32_t __resource_rb_abi_value_new(uint32_t val);
-
-rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_abi_value_new(void *data) {
-  return (rb_abi_guest_rb_abi_value_t){__resource_rb_abi_value_new((uint32_t) data)};
-}
-
-__attribute__((import_module("canonical_abi"), import_name("resource_get_rb-abi-value")))
-uint32_t __resource_rb_abi_value_get(uint32_t idx);
-
-void* rb_abi_guest_rb_abi_value_get(rb_abi_guest_rb_abi_value_t *ptr) {
-  return (void*) __resource_rb_abi_value_get(ptr->idx);
-}
-
-__attribute__((export_name("canonical_abi_drop_rb-abi-value")))
-void __resource_rb_abi_value_dtor(uint32_t val) {
-  if (rb_abi_guest_rb_abi_value_dtor)
-  rb_abi_guest_rb_abi_value_dtor((void*) val);
-}
 #include <string.h>
 
 void rb_abi_guest_string_set(rb_abi_guest_string_t *ret, const char *s) {
@@ -109,13 +41,7 @@ void rb_abi_guest_list_string_free(rb_abi_guest_list_string_t *ptr) {
     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);
-}
 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]);
-  }
   if (ptr->len > 0) {
     free(ptr->ptr);
   }
@@ -136,11 +62,11 @@ 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: func(args: list<string>) -> handle<rb-iseq>")))
+__attribute__((export_name("ruby-options: func(args: list<string>) -> u32")))
 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;
+  rb_abi_guest_rb_abi_value_t ret = rb_abi_guest_ruby_options(&arg1);
+  return (int32_t) (ret);
 }
 __attribute__((export_name("ruby-script: func(name: string) -> ()")))
 void __wasm_export_rb_abi_guest_ruby_script(int32_t arg, int32_t arg0) {
@@ -151,23 +77,23 @@ __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: func(str: string) -> tuple<handle<rb-abi-value>, s32>")))
+__attribute__((export_name("rb-eval-string-protect: func(str: string) -> tuple<u32, 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_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 + 0)) = ((ret).f0).idx;
+  *((int32_t*)(ptr + 0)) = (int32_t) ((ret).f0);
   *((int32_t*)(ptr + 4)) = (ret).f1;
   return ptr;
 }
-__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>")))
+__attribute__((export_name("rb-funcallv-protect: func(recv: u32, mid: u32, args: list<u32>) -> tuple<u32, 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_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);
+  rb_abi_guest_rb_funcallv_protect((uint32_t) (arg), (uint32_t) (arg0), &arg3, &ret);
   int32_t ptr = (int32_t) &RET_AREA;
-  *((int32_t*)(ptr + 0)) = ((ret).f0).idx;
+  *((int32_t*)(ptr + 0)) = (int32_t) ((ret).f0);
   *((int32_t*)(ptr + 4)) = (ret).f1;
   return ptr;
 }
@@ -177,19 +103,19 @@ int32_t __wasm_export_rb_abi_guest_rb_intern(int32_t arg, int32_t arg0) {
   rb_abi_guest_rb_id_t ret = rb_abi_guest_rb_intern(&arg1);
   return (int32_t) (ret);
 }
-__attribute__((export_name("rb-errinfo: func() -> handle<rb-abi-value>")))
+__attribute__((export_name("rb-errinfo: func() -> u32")))
 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;
+  return (int32_t) (ret);
 }
 __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: func(value: handle<rb-abi-value>) -> string")))
+__attribute__((export_name("rstring-ptr: func(value: u32) -> 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);
+  rb_abi_guest_rstring_ptr((uint32_t) (arg), &ret);
   int32_t ptr = (int32_t) &RET_AREA;
   *((int32_t*)(ptr + 4)) = (int32_t) (ret).len;
   *((int32_t*)(ptr + 0)) = (int32_t) (ret).ptr;

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

@@ -8,28 +8,6 @@ extern "C"
   #include <stdint.h>
   #include <stdbool.h>
 
-  typedef struct {
-    uint32_t idx;
-  } rb_abi_guest_rb_iseq_t;
-  void rb_abi_guest_rb_iseq_free(rb_abi_guest_rb_iseq_t *ptr);
-  rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_clone(rb_abi_guest_rb_iseq_t *ptr);
-  rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_new(void *data);
-  void* rb_abi_guest_rb_iseq_get(rb_abi_guest_rb_iseq_t *ptr);
-  
-  __attribute__((weak))
-  void rb_abi_guest_rb_iseq_dtor(void *data);
-  
-  typedef struct {
-    uint32_t idx;
-  } rb_abi_guest_rb_abi_value_t;
-  void rb_abi_guest_rb_abi_value_free(rb_abi_guest_rb_abi_value_t *ptr);
-  rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_abi_value_clone(rb_abi_guest_rb_abi_value_t *ptr);
-  rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_abi_value_new(void *data);
-  void* rb_abi_guest_rb_abi_value_get(rb_abi_guest_rb_abi_value_t *ptr);
-  
-  __attribute__((weak))
-  void rb_abi_guest_rb_abi_value_dtor(void *data);
-  
   typedef struct {
     char *ptr;
     size_t len;
@@ -38,6 +16,9 @@ extern "C"
   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);
   void rb_abi_guest_string_free(rb_abi_guest_string_t *ret);
+  // A Ruby value, which is as known as a VALUE in the Ruby C API.
+  // This represents a handle owned by the Ruby guest environment.
+  typedef uint32_t rb_abi_guest_rb_abi_value_t;
   typedef int32_t rb_abi_guest_rb_errno_t;
   typedef uint32_t rb_abi_guest_rb_id_t;
   typedef struct {
@@ -49,7 +30,6 @@ extern "C"
     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;
@@ -58,7 +38,7 @@ extern "C"
   void rb_abi_guest_ruby_show_version(void);
   void rb_abi_guest_ruby_init(void);
   void rb_abi_guest_ruby_sysinit(rb_abi_guest_list_string_t *args);
-  rb_abi_guest_rb_iseq_t rb_abi_guest_ruby_options(rb_abi_guest_list_string_t *args);
+  rb_abi_guest_rb_abi_value_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_tuple2_rb_abi_value_s32_t *ret0);

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

@@ -1,12 +1,14 @@
-resource rb-iseq
-resource rb-abi-value
+/// A Ruby value, which is as known as a VALUE in the Ruby C API.
+/// This represents a handle owned by the Ruby guest environment.
+type rb-abi-value = u32
+
 type rb-errno = s32
 type rb-id = u32
 
 ruby-show-version: func()
 ruby-init: func()
 ruby-sysinit: func(args: list<string>)
-ruby-options: func(args: list<string>) -> rb-iseq
+ruby-options: func(args: list<string>) -> rb-abi-value
 ruby-script: func(name: string)
 ruby-init-loadpath: func()
 rb-eval-string-protect: func(str: string) -> tuple<rb-abi-value, s32>

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

@@ -172,6 +172,13 @@ void rb_abi_lend_object(VALUE obj) {
   assert(state == TAG_NONE && "rb_abi_lend_object_internal failed");
 }
 
+static inline rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_abi_value_new(VALUE obj) {
+  return (rb_abi_guest_rb_abi_value_t)(obj);
+}
+static inline VALUE rb_abi_guest_rb_abi_value_get(rb_abi_guest_rb_abi_value_t *self) {
+  return (VALUE)(*self);
+}
+
 static VALUE rb_abi_guest_rb_abi_value_dtor_internal(VALUE obj) {
   VALUE object_id = rb_obj_id(obj);
   VALUE ref_count = rb_hash_lookup(rb_abi_guest_refcount_hash, object_id);
@@ -223,20 +230,20 @@ void rb_abi_guest_ruby_sysinit(rb_abi_guest_list_string_t *args) {
   RB_WASM_LIB_RT(ruby_sysinit(&argc, &c_args))
 }
 
-rb_abi_guest_rb_iseq_t
+rb_abi_guest_rb_abi_value_t
 rb_abi_guest_ruby_options(rb_abi_guest_list_string_t *args) {
-  void *result;
+  VALUE result;
   char **c_args;
   c_strings_from_abi(args, c_args);
-  RB_WASM_LIB_RT(result = ruby_options(args->len, c_args))
-  return rb_abi_guest_rb_iseq_new(result);
+  RB_WASM_LIB_RT(result = (VALUE)ruby_options(args->len, c_args))
+  return rb_abi_guest_rb_abi_value_new(result);
 }
 
 rb_abi_guest_rb_errno_t
-rb_abi_guest_ruby_run_node(rb_abi_guest_rb_iseq_t node) {
+rb_abi_guest_ruby_run_node(rb_abi_guest_rb_abi_value_t node) {
   int result;
-  void *iseq = rb_abi_guest_rb_iseq_get(&node);
-  RB_WASM_LIB_RT(ruby_run_node(iseq))
+  VALUE iseq = rb_abi_guest_rb_abi_value_get(&node);
+  RB_WASM_LIB_RT(ruby_run_node((void *)iseq))
   return result;
 }
 
@@ -260,7 +267,7 @@ void rb_abi_guest_rb_eval_string_protect(
   if (ret0->f1 == TAG_NONE) {
     rb_abi_lend_object(retval);
   }
-  ret0->f0 = rb_abi_guest_rb_abi_value_new((void *)retval);
+  ret0->f0 = rb_abi_guest_rb_abi_value_new(retval);
 }
 
 struct rb_funcallv_thunk_ctx {
@@ -294,7 +301,7 @@ void rb_abi_guest_rb_funcallv_protect(
   if (ret0->f1 == TAG_NONE) {
     rb_abi_lend_object(retval);
   }
-  ret0->f0 = rb_abi_guest_rb_abi_value_new((void *)retval);
+  ret0->f0 = rb_abi_guest_rb_abi_value_new(retval);
 }
 
 rb_abi_guest_rb_id_t rb_abi_guest_rb_intern(rb_abi_guest_string_t *name) {
@@ -305,7 +312,7 @@ rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
   VALUE retval;
   RB_WASM_LIB_RT(retval = rb_errinfo());
   rb_abi_lend_object(retval);
-  return rb_abi_guest_rb_abi_value_new((void *)retval);
+  return rb_abi_guest_rb_abi_value_new(retval);
 }
 
 void rb_abi_guest_rb_clear_errinfo(void) { rb_set_errinfo(Qnil); }

ext/witapi/witapi-core.c

@@ -41,46 +41,6 @@ export function utf8_encode(s, realloc, memory) {
 }
 export let UTF8_ENCODED_LEN = 0;
 
-export class Slab {
-  constructor() {
-    this.list = [];
-    this.head = 0;
-  }
-  
-  insert(val) {
-    if (this.head >= this.list.length) {
-      this.list.push({
-        next: this.list.length + 1,
-        val: undefined,
-      });
-    }
-    const ret = this.head;
-    const slot = this.list[ret];
-    this.head = slot.next;
-    slot.next = -1;
-    slot.val = val;
-    return ret;
-  }
-  
-  get(idx) {
-    if (idx >= this.list.length)
-    throw new RangeError('handle index not valid');
-    const slot = this.list[idx];
-    if (slot.next === -1)
-    return slot.val;
-    throw new RangeError('handle index not valid');
-  }
-  
-  remove(idx) {
-    const ret = this.get(idx); // validate the slot
-    const slot = this.list[idx];
-    slot.val = undefined;
-    slot.next = this.head;
-    this.head = idx;
-    return ret;
-  }
-}
-
 export function throw_invalid_bool() {
   throw new RangeError("invalid variant discriminant for bool");
 }