Revert GC enable/disable interface

Author: kateinoigakukun

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

@@ -205,13 +205,3 @@ __attribute__((export_name("rb-vm-bugreport: func() -> ()")))
 void __wasm_export_rb_abi_guest_rb_vm_bugreport(void) {
   rb_abi_guest_rb_vm_bugreport();
 }
-__attribute__((export_name("rb-gc-enable: func() -> bool")))
-int32_t __wasm_export_rb_abi_guest_rb_gc_enable(void) {
-  bool ret = rb_abi_guest_rb_gc_enable();
-  return ret;
-}
-__attribute__((export_name("rb-gc-disable: func() -> bool")))
-int32_t __wasm_export_rb_abi_guest_rb_gc_disable(void) {
-  bool ret = rb_abi_guest_rb_gc_disable();
-  return ret;
-}

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

@@ -68,8 +68,6 @@ extern "C"
   void rb_abi_guest_rb_clear_errinfo(void);
   void rb_abi_guest_rstring_ptr(rb_abi_guest_rb_abi_value_t value, rb_abi_guest_string_t *ret0);
   void rb_abi_guest_rb_vm_bugreport(void);
-  bool rb_abi_guest_rb_gc_enable(void);
-  bool rb_abi_guest_rb_gc_disable(void);
   #ifdef __cplusplus
 }
 #endif

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

@@ -18,6 +18,3 @@ rb-clear-errinfo: func()
 rstring-ptr: func(value: rb-abi-value) -> string
 
 rb-vm-bugreport: func()
-
-rb-gc-enable: func() -> bool
-rb-gc-disable: func() -> bool

ext/witapi/witapi-core.c

@@ -303,11 +303,4 @@ void rb_vm_bugreport(const void *);
 
 void rb_abi_guest_rb_vm_bugreport(void) { rb_vm_bugreport(NULL); }
 
-bool rb_abi_guest_rb_gc_enable(void) {
-  return rb_gc_enable() == Qtrue;
-}
-bool rb_abi_guest_rb_gc_disable(void) {
-  return rb_gc_disable() == Qtrue;
-}
-
 void Init_witapi(void) {}

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

@@ -80,8 +80,6 @@ export class RbAbiGuest {
   rbClearErrinfo(): void;
   rstringPtr(value: RbAbiValue): string;
   rbVmBugreport(): void;
-  rbGcEnable(): boolean;
-  rbGcDisable(): boolean;
 }
 
 export class RbIseq {

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

@@ -1,4 +1,4 @@
-import { data_view, to_uint32, UTF8_DECODER, utf8_encode, UTF8_ENCODED_LEN, Slab, throw_invalid_bool } 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();
@@ -161,16 +161,6 @@ export class RbAbiGuest {
   rbVmBugreport() {
     this._exports['rb-vm-bugreport: func() -> ()']();
   }
-  rbGcEnable() {
-    const ret = this._exports['rb-gc-enable: func() -> bool']();
-    const bool0 = ret;
-    return bool0 == 0 ? false : (bool0 == 1 ? true : throw_invalid_bool());
-  }
-  rbGcDisable() {
-    const ret = this._exports['rb-gc-disable: func() -> bool']();
-    const bool0 = ret;
-    return bool0 == 0 ? false : (bool0 == 1 ? true : throw_invalid_bool());
-  }
 }
 
 export class RbIseq {

packages/npm-packages/ruby-wasm-wasi/src/index.ts

@@ -38,7 +38,7 @@ export class RubyVM {
     // Wrap exported functions from Ruby VM to prohibit nested VM operation
     // if the call stack has sandwitched JS frames like JS -> Ruby -> JS -> Ruby.
     const proxyExports = (exports: RbAbi.RbAbiGuest) => {
-      const excludedMethods: (keyof RbAbi.RbAbiGuest)[] = ["addToImports", "instantiate", "rbGcEnable", "rbGcDisable"];
+      const excludedMethods: (keyof RbAbi.RbAbiGuest)[] = ["addToImports", "instantiate"];
       const excluded = ["constructor"].concat(excludedMethods);
       // wrap all methods in RbAbi.RbAbiGuest class
       for (const key of Object.getOwnPropertyNames(RbAbi.RbAbiGuest.prototype)) {
@@ -107,10 +107,10 @@ export class RubyVM {
         }
       };
     }
-    // NOTE: The imported functions must disable Ruby GC if they call
-    // Ruby API that may trigger GC. Otherwise, the GC may collect
-    // objects that are still referenced by Wasm locals because Asyncify
-    // cannot scan the Wasm stack above the JS frame.
+    // NOTE: The GC may collect objects that are still referenced by Wasm
+    // locals because Asyncify cannot scan the Wasm stack above the JS frame.
+    // So we need to keep track whether the JS frame is sandwitched by Ruby
+    // frames or not, and prohibit nested VM operation if it is.
     const proxyImports = (imports: RbJsAbiHost) => {
       for (const [key, value] of Object.entries(imports)) {
         if (typeof value === "function") {
@@ -343,8 +343,7 @@ export class RubyVM {
 type RbAbiInterfaceState = {
   /**
    * Track if the last JS frame that was created by a Ruby frame
-   * to determine if we need to disable Ruby GC during nested
-   * JS->Ruby->JS->Ruby calls
+   * to determine if we have a sandwitched JS frame between Ruby frames.
   **/
   hasJSFrameAfterRbFrame: boolean;
 }