Make compilation with component model successful

But still linking fails because of missing symbols.

Author: kateinoigakukun

packages/gems/js/ext/js/depend

@@ -1,3 +1,4 @@
+CLEANFILES += link.filelist
 link.filelist:
 	echo $(foreach obj,$(OBJS),$(abspath $(obj))) > $@
 	echo $(EXTRA_OBJS) >> $@

packages/gems/js/ext/js/extconf.rb

@@ -13,4 +13,5 @@
 end
 create_makefile("js") do |mk|
   mk << "EXTRA_OBJS = $(srcdir)/bindgen/ext_component_type.o\n" if use_component_model
+  mk
 end

packages/gems/js/ext/js/js-core.c

@@ -2,7 +2,7 @@
 
 #include "ruby.h"
 
-#include "bindgen/legacy/rb-js-abi-host.h"
+#include "types.h"
 
 // MARK: - Ruby extension
 
@@ -57,7 +57,7 @@ static VALUE jsvalue_s_allocate(VALUE klass) {
   return obj;
 }
 
-static VALUE jsvalue_s_new(rb_js_abi_host_js_abi_value_t abi) {
+static VALUE jsvalue_s_new(rb_js_abi_host_own_js_abi_value_t abi) {
   struct jsvalue *p;
   VALUE obj = TypedData_Make_Struct(rb_cJS_Object, struct jsvalue,
                                     &jsvalue_data_type, p);
@@ -379,7 +379,7 @@ static VALUE _rb_js_obj_to_i(VALUE obj) {
   if (ret.tag == RB_JS_ABI_HOST_RAW_INTEGER_F64) {
     result = rb_dbl2big(ret.val.f64);
   } else {
-    result = rb_cstr2inum(ret.val.bignum.ptr, 10);
+    result = rb_cstr2inum((const char *)ret.val.bignum.ptr, 10);
   }
   rb_js_abi_host_raw_integer_free(&ret);
   return result;
@@ -409,7 +409,7 @@ static VALUE _rb_js_obj_to_f(VALUE obj) {
   if (ret.tag == RB_JS_ABI_HOST_RAW_INTEGER_F64) {
     result = rb_float_new(ret.val.f64);
   } else {
-    result = DBL2NUM(rb_cstr_to_dbl(ret.val.bignum.ptr, FALSE));
+    result = DBL2NUM(rb_cstr_to_dbl((const char *)ret.val.bignum.ptr, FALSE));
   }
   rb_js_abi_host_raw_integer_free(&ret);
   return result;

packages/gems/js/ext/js/types.h

@@ -0,0 +1,37 @@
+#ifndef RUBY_WASM_JS_TYPES_H
+#define RUBY_WASM_JS_TYPES_H
+
+#ifdef JS_ENABLE_COMPONENT_MODEL
+# include "bindgen/ext.h"
+
+typedef exports_ruby_js_ruby_runtime_borrow_rb_abi_value_t         rb_abi_guest_rb_abi_value_t;
+typedef exports_ruby_js_ruby_runtime_own_rb_abi_value_t            rb_abi_guest_own_rb_abi_value_t;
+typedef exports_ruby_js_ruby_runtime_list_borrow_rb_abi_value_t    rb_abi_guest_list_rb_abi_value_t;
+typedef exports_ruby_js_ruby_runtime_own_rb_iseq_t                 rb_abi_guest_rb_iseq_t;
+typedef exports_ruby_js_ruby_runtime_rb_id_t                       rb_abi_guest_rb_id_t;
+typedef exports_ruby_js_ruby_runtime_tuple2_own_rb_abi_value_s32_t rb_abi_guest_tuple2_rb_abi_value_s32_t;
+
+typedef ruby_js_js_runtime_borrow_js_abi_value_t      rb_js_abi_host_js_abi_value_t;
+typedef ruby_js_js_runtime_own_js_abi_value_t         rb_js_abi_host_own_js_abi_value_t;
+typedef ruby_js_js_runtime_js_abi_result_t            rb_js_abi_host_js_abi_result_t;
+typedef ruby_js_js_runtime_list_borrow_js_abi_value_t rb_js_abi_host_list_js_abi_value_t;
+typedef ruby_js_js_runtime_raw_integer_t               rb_js_abi_host_raw_integer_t;
+
+typedef ext_string_t rb_abi_guest_string_t;
+typedef ext_string_t rb_js_abi_host_string_t;
+typedef ext_list_string_t rb_abi_guest_list_string_t;
+
+# define rb_abi_guest_rb_abi_value_new(val) exports_ruby_js_ruby_runtime_rb_abi_value_new(val)
+# define rb_abi_guest_rb_abi_value_get(val) (*(val))
+# define rb_abi_guest_rb_iseq_new(val) exports_ruby_js_ruby_runtime_rb_iseq_new(val)
+# define rb_js_abi_host_js_value_equal(lhs, rhs) ruby_js_js_runtime_js_value_equal(lhs, rhs)
+# define rb_js_abi_host_reflect_apply(target, this, args, ret) ruby_js_js_runtime_reflect_apply(target, this, args, ret)
+# define rb_js_abi_host_js_value_to_integer(value, ret) ruby_js_js_runtime_js_value_to_integer(value, ret)
+#else
+# include "bindgen/legacy/rb-abi-guest.h"
+# include "bindgen/legacy/rb-js-abi-host.h"
+typedef rb_abi_guest_rb_abi_value_t            rb_abi_guest_own_rb_abi_value_t;
+typedef rb_js_abi_host_js_abi_value_t          rb_js_abi_host_own_js_abi_value_t;
+#endif
+
+#endif // RUBY_WASM_JS_TYPES_H

packages/gems/js/ext/js/witapi-core.c

@@ -17,7 +17,7 @@ static VALUE rb_eval_string_value_protect(VALUE str, int *pstate) {
 
 #define TAG_NONE 0
 
-#include "bindgen/legacy/rb-abi-guest.h"
+#include "types.h"
 
 __attribute__((import_module("asyncify"), import_name("start_unwind"))) void
 asyncify_start_unwind(void *buf);
@@ -122,7 +122,7 @@ rb_wasm_throw_prohibit_rewind_exception(const char *c_msg, size_t msg_len);
   {                                                                            \
     new_args = alloca(sizeof(char *) * ((list)->len + 1));                     \
     for (size_t i = 0; i < (list)->len; i++) {                                 \
-      new_args[i] = (list)->ptr[i].ptr;                                        \
+      new_args[i] = (char *)((list)->ptr[i].ptr);                        \
     }                                                                          \
   }
 
@@ -176,6 +176,15 @@ void rb_abi_guest_rb_abi_value_dtor(void *data) {
   assert(state == TAG_NONE && "rb_abi_guest_rb_abi_value_dtor_internal failed");
 }
 
+#ifdef JS_ENABLE_COMPONENT_MODEL
+void exports_ruby_js_ruby_runtime_rb_iseq_destructor(exports_ruby_js_ruby_runtime_rb_iseq_t *rep) {
+}
+
+void exports_ruby_js_ruby_runtime_rb_abi_value_destructor(exports_ruby_js_ruby_runtime_rb_abi_value_t *rep) {
+  rb_abi_guest_rb_abi_value_dtor((void *)rep);
+}
+#endif
+
 // MARK: - Exported functions
 // NOTE: Assume that callers always pass null terminated string by
 // rb_abi_guest_string_t
@@ -209,7 +218,7 @@ rb_abi_guest_ruby_options(rb_abi_guest_list_string_t *args) {
 }
 
 void rb_abi_guest_ruby_script(rb_abi_guest_string_t *name) {
-  RB_WASM_LIB_RT(ruby_script(name->ptr))
+  RB_WASM_LIB_RT(ruby_script((const char *)name->ptr))
 }
 
 void rb_abi_guest_ruby_init_loadpath(void) {
@@ -220,7 +229,7 @@ void rb_abi_guest_rb_eval_string_protect(
     rb_abi_guest_string_t *str, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0) {
   VALUE retval;
   RB_WASM_DEBUG_LOG("rb_eval_string_protect: str = %s\n", str->ptr);
-  VALUE utf8_str = rb_utf8_str_new(str->ptr, str->len);
+  VALUE utf8_str = rb_utf8_str_new((const char *)str->ptr, str->len);
   RB_WASM_LIB_RT(retval = rb_eval_string_value_protect(utf8_str, &ret0->f1));
   RB_WASM_DEBUG_LOG("rb_eval_string_protect: retval = %p, state = %d\n",
                     (void *)retval, ret0->f1);
@@ -266,10 +275,10 @@ void rb_abi_guest_rb_funcallv_protect(
 }
 
 rb_abi_guest_rb_id_t rb_abi_guest_rb_intern(rb_abi_guest_string_t *name) {
-  return rb_intern(name->ptr);
+  return rb_intern((const char *)name->ptr);
 }
 
-rb_abi_guest_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
+rb_abi_guest_own_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
   VALUE retval;
   RB_WASM_LIB_RT(retval = rb_errinfo());
   rb_abi_lend_object(retval);