js 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2886bbeac0af159a2c25b2cceb53b967f4ef7928f2e8518648f0517f4b5a8a3b
-  data.tar.gz: 598e83d78b499fabeb223f98b980f5716650246d42a24cd0cb327fd27ac95e10
+  metadata.gz: 153c572884d06b66e29644640877fa1b35d8d08725d44cafb0895e0269f40d8d
+  data.tar.gz: 67351a2724d1c4f74aba3506d14334bef7055918e564429ac9eaf73b277dbcac
 SHA512:
-  metadata.gz: 56a2c02d0f6d42e27ff3d45385e1bcc1e7464d18ea0ed07e92cf08a8d7469cbb27cdc38f8ee69eb67ca3052455d1cd2a5a10016e338f03f3aa8bb3127a806ae0
-  data.tar.gz: cffe906a9cfa1710d75f9df827bdc9b406009ddc90291fef4b036aa7c6e70a495de130883114762f83456dd69243134683bb7c4bef038069229385c97b89cd5d
+  metadata.gz: 7f5cfd35ce5a3242d83553dc3fe8e71664fcad0198535d85ee06adbad272cae7d3eddc2ade6e9852b4f81c559056f4f0904474f83ad6d0a000536a9b0d93a10b
+  data.tar.gz: bd603fe5fe568ec47898d1356a1e46f0bde720313c56b24e36b4f1f70d46f3995c87728621463d332ba37fd347f7ae7f78d218c99adf0d594f50954e21515a49

data/ext/js/js-core.c

@@ -438,7 +438,7 @@ static VALUE _rb_js_import_from_js(VALUE obj) {
  *  Returns +obj+ wrapped by JS class RbValue.
  */
 static VALUE _rb_js_obj_wrap(VALUE obj, VALUE wrapping) {
-#if JS_ENABLE_COMPONENT_MODEL
+#ifdef JS_ENABLE_COMPONENT_MODEL
   rb_abi_stage_rb_value_to_js(wrapping);
   return jsvalue_s_new(rb_js_abi_host_rb_object_to_js_rb_value());
 #else
@@ -511,7 +511,7 @@ static VALUE _rb_js_false_to_js(VALUE obj) {
  *  Returns +self+ as a JS::Object.
  */
 static VALUE _rb_js_proc_to_js(VALUE obj) {
-#if JS_ENABLE_COMPONENT_MODEL
+#ifdef JS_ENABLE_COMPONENT_MODEL
   rb_abi_stage_rb_value_to_js(obj);
   return jsvalue_s_new(ruby_js_js_runtime_proc_to_js_function());
 #else

data/ext/js/witapi-core.c

@@ -3,7 +3,11 @@
 #include "ruby.h"
 #include "ruby/version.h"
 
-static VALUE rb_eval_string_value_protect_thunk(VALUE str) {
+#include "types.h"
+
+static VALUE rb_eval_string_value_protect_thunk(VALUE ctx) {
+  const rb_abi_guest_string_t *cabi_str = (const rb_abi_guest_string_t *)ctx;
+  VALUE str = rb_utf8_str_new((const char *)cabi_str->ptr, cabi_str->len);
   const ID id_eval = rb_intern("eval");
   VALUE binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
   const VALUE file = rb_utf8_str_new("eval", 4);
@@ -11,14 +15,13 @@ static VALUE rb_eval_string_value_protect_thunk(VALUE str) {
   return rb_funcallv(rb_mKernel, id_eval, 3, args);
 }
 
-static VALUE rb_eval_string_value_protect(VALUE str, int *pstate) {
-  return rb_protect(rb_eval_string_value_protect_thunk, str, pstate);
+static VALUE rb_eval_string_value_protect(const rb_abi_guest_string_t *str,
+                                          int *pstate) {
+  return rb_protect(rb_eval_string_value_protect_thunk, (VALUE)str, pstate);
 }
 
 #define TAG_NONE 0
 
-#include "types.h"
-
 __attribute__((import_module("asyncify"), import_name("start_unwind"))) void
 asyncify_start_unwind(void *buf);
 #define asyncify_start_unwind(buf)                                             \
@@ -200,15 +203,17 @@ void exports_ruby_js_ruby_runtime_rb_abi_value_destructor(
 
 void rb_abi_guest_ruby_show_version(void) { ruby_show_version(); }
 
-void rb_abi_guest_ruby_init(void) {
-  RB_WASM_LIB_RT(ruby_init())
-
+__attribute__((noinline)) static void rb_abi_guest_ruby_init_thunk(void) {
+  ruby_init();
   rb_abi_guest_arena_hash = rb_hash_new();
   rb_abi_guest_refcount_hash = rb_hash_new();
 
   rb_gc_register_mark_object(rb_abi_guest_arena_hash);
   rb_gc_register_mark_object(rb_abi_guest_refcount_hash);
 }
+void rb_abi_guest_ruby_init(void) {
+  RB_WASM_LIB_RT(rb_abi_guest_ruby_init_thunk())
+}
 
 void rb_abi_guest_ruby_sysinit(rb_abi_guest_list_string_t *args) {
   char **c_args;
@@ -234,12 +239,11 @@ void rb_abi_guest_ruby_init_loadpath(void) {
   RB_WASM_LIB_RT(ruby_init_loadpath())
 }
 
-void rb_abi_guest_rb_eval_string_protect(
+__attribute__((noinline)) static void rb_abi_guest_rb_eval_string_protect_thunk(
     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((const char *)str->ptr, str->len);
-  RB_WASM_LIB_RT(retval = rb_eval_string_value_protect(utf8_str, &ret0->f1));
+  retval = rb_eval_string_value_protect(str, &ret0->f1);
   RB_WASM_DEBUG_LOG("rb_eval_string_protect: retval = %p, state = %d\n",
                     (void *)retval, ret0->f1);
 
@@ -248,6 +252,10 @@ void rb_abi_guest_rb_eval_string_protect(
   }
   ret0->f0 = rb_abi_guest_rb_abi_value_new((void *)retval);
 }
+void rb_abi_guest_rb_eval_string_protect(
+    rb_abi_guest_string_t *str, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0) {
+  RB_WASM_LIB_RT(rb_abi_guest_rb_eval_string_protect_thunk(str, ret0));
+}
 
 struct rb_funcallv_thunk_ctx {
   VALUE recv;
@@ -284,7 +292,9 @@ 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((const char *)name->ptr);
+  VALUE retval;
+  RB_WASM_LIB_RT(retval = rb_intern((const char *)name->ptr));
+  return (rb_abi_guest_rb_id_t)retval;
 }
 
 rb_abi_guest_own_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
@@ -294,16 +304,24 @@ rb_abi_guest_own_rb_abi_value_t rb_abi_guest_rb_errinfo(void) {
   return rb_abi_guest_rb_abi_value_new((void *)retval);
 }
 
-void rb_abi_guest_rb_clear_errinfo(void) { rb_set_errinfo(Qnil); }
+void rb_abi_guest_rb_clear_errinfo(void) {
+  RB_WASM_LIB_RT(rb_set_errinfo(Qnil));
+}
 
-void rb_abi_guest_rstring_ptr(rb_abi_guest_rb_abi_value_t value,
-                              rb_abi_guest_string_t *ret0) {
+__attribute__((noinline)) static void
+rb_abi_guest_rstring_ptr_thunk(rb_abi_guest_rb_abi_value_t value,
+                               rb_abi_guest_string_t *ret0) {
   VALUE r_str = (VALUE)rb_abi_guest_rb_abi_value_get(&value);
   ret0->len = RSTRING_LEN(r_str);
   ret0->ptr = xmalloc(ret0->len);
   memcpy(ret0->ptr, RSTRING_PTR(r_str), ret0->len);
 }
 
+void rb_abi_guest_rstring_ptr(rb_abi_guest_rb_abi_value_t value,
+                              rb_abi_guest_string_t *ret0) {
+  RB_WASM_LIB_RT(rb_abi_guest_rstring_ptr_thunk(value, ret0));
+}
+
 uint32_t rb_abi_guest_rb_abi_value_data_ptr(rb_abi_guest_rb_abi_value_t self) {
   VALUE obj = (VALUE)rb_abi_guest_rb_abi_value_get(&self);
   return (uint32_t)DATA_PTR(obj);
@@ -340,6 +358,8 @@ bool rb_abi_guest_rb_set_should_prohibit_rewind(bool value) {
   return old;
 }
 
+#ifdef JS_ENABLE_COMPONENT_MODEL
+
 static VALUE rb_abi_export_stage = Qnil;
 static rb_abi_guest_own_rb_abi_value_t rb_abi_export_rb_value_to_js(void) {
   VALUE staged = rb_abi_export_stage;
@@ -354,8 +374,6 @@ void rb_abi_stage_rb_value_to_js(VALUE value) {
   rb_abi_export_stage = value;
 }
 
-#ifdef JS_ENABLE_COMPONENT_MODEL
-
 extern void __wasm_call_ctors(void);
 static inline void __wasm_call_ctors_if_needed(void) {
   static bool __wasm_call_ctors_done = false;

data/lib/js/version.rb

@@ -1,3 +1,3 @@
 module JS
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Yuta Saito
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies: []
 description: JavaScript bindings for ruby.wasm. This gem provides a way to use JavaScript
   functionalities from Ruby through WebAssembly.
@@ -52,7 +52,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/ruby/ruby.wasm/tree/main/packages/gems/js
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -67,8 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: JavaScript bindings for ruby.wasm
 test_files: []