[pull] master from ruby:master

.github/workflows/compilers.yml

@@ -244,7 +244,7 @@ jobs:
       - { uses: './.github/actions/compilers', name: 'RGENGC_CHECK_MODE',              with: { cppflags: '-DRGENGC_CHECK_MODE' }, timeout-minutes: 5 }
       - { uses: './.github/actions/compilers', name: 'VM_CHECK_MODE',                  with: { cppflags: '-DVM_CHECK_MODE' }, timeout-minutes: 5 }
       - { uses: './.github/actions/compilers', name: 'USE_EMBED_CI=0',                 with: { cppflags: '-DUSE_EMBED_CI=0' }, timeout-minutes: 5 }
-      - { uses: './.github/actions/compilers', name: 'USE_FLONUM=0',                   with: { cppflags: '-DUSE_FLONUM=0', append_configure: '--disable-yjit' }, timeout-minutes: 5 }
+      - { uses: './.github/actions/compilers', name: 'USE_FLONUM=0',                   with: { cppflags: '-DUSE_FLONUM=0', append_configure: '--disable-yjit --disable-zjit' }, timeout-minutes: 5 }
 
   compileX:
     name: 'omnibus compilations, #10'

NEWS.md

@@ -234,30 +234,32 @@ releases.
 
 The following default gem is added.
 
-* win32-registry 0.1.1
+* win32-registry 0.1.2
 
 The following default gems are updated.
 
 * RubyGems 4.0.1
 * bundler 4.0.1
-* date 3.5.0
+* date 3.5.1
 * digest 3.2.1
 * english 0.8.1
 * erb 6.0.0
 * etc 1.4.6
 * fcntl 1.3.0
 * fileutils 1.8.0
+* forwardable 1.4.0
 * io-console 0.8.1
 * io-nonblock 0.3.2
 * io-wait 0.4.0.dev
+* ipaddr 1.2.8
 * json 2.17.1
 * net-http 0.8.0
 * openssl 4.0.0.pre
-* optparse 0.8.0
+* optparse 0.8.1
 * pp 0.6.3
 * prism 1.6.0
-* psych 5.2.6
-* resolv 0.6.3
+* psych 5.3.0
+* resolv 0.7.0
 * stringio 3.1.9.dev
 * strscan 3.1.6.dev
 * timeout 0.5.0

bootstraptest/test_ractor.rb

@@ -1494,6 +1494,9 @@ class C
     unless a[i].equal?(b[i])
       raise [a[i], b[i]].inspect
     end
+    unless a[i] == i.to_s
+      raise [i, a[i], b[i]].inspect
+    end
   end
   :ok
 }

box.c

@@ -760,7 +760,7 @@ static int
 cleanup_local_extension_i(VALUE key, VALUE value, VALUE arg)
 {
 #if defined(_WIN32)
-    HMODULE h = (HMODULE)NUM2SVALUE(value);
+    HMODULE h = (HMODULE)NUM2PTR(value);
     WCHAR module_path[MAXPATHLEN];
     DWORD len = GetModuleFileNameW(h, module_path, numberof(module_path));
 

compile.c

@@ -610,8 +610,6 @@ branch_coverage_valid_p(rb_iseq_t *iseq, int first_line)
     return 1;
 }
 
-#define PTR2NUM(x) (rb_int2inum((intptr_t)(void *)(x)))
-
 static VALUE
 setup_branch(const rb_code_location_t *loc, const char *type, VALUE structure, VALUE key)
 {