[pull] master from ruby:master

.github/auto_request_review.yml

@@ -10,6 +10,7 @@ files:
   'zjit/src/cruby_bindings.inc.rs': []
   'doc/zjit*': [team:jit]
   'test/ruby/test_zjit*': [team:jit]
+  'test/.excludes-zjit/*': [team:jit]
   'defs/jit.mk': [team:jit]
 options:
   ignore_draft: true

.github/workflows/zjit-ubuntu.yml

@@ -42,7 +42,7 @@ jobs:
 
           - test_task: 'zjit-test-all'
             configure: '--enable-zjit=dev'
-            testopts: '--seed=11831'
+            testopts: '--seed=18140'
 
           - test_task: 'btest'
             configure: '--enable-zjit=dev'

Cargo.toml

@@ -22,8 +22,7 @@ path = "jit.rs"
 
 [features]
 disasm = ["yjit?/disasm", "zjit?/disasm"]
-# TODO(GH-642) Turning this on trips a btest failure.
-runtime_checks = [] # ["yjit?/runtime_checks", "zjit?/runtime_checks"]
+runtime_checks = ["yjit?/runtime_checks", "zjit?/runtime_checks"]
 yjit = [ "dep:yjit" ]
 zjit = [ "dep:zjit" ]
 

NEWS.md

@@ -120,7 +120,7 @@ Note: We're only listing outstanding class updates.
 
 The following bundled gems are promoted from default gems.
 
-* ostruct 0.6.2
+* ostruct 0.6.3
 * pstore 0.2.0
 * benchmark 0.4.1
 * logger 1.7.0
@@ -143,12 +143,13 @@ The following default gem is added.
 
 The following default gems are updated.
 
-* RubyGems 3.7.0.dev
-* bundler 2.7.0.dev
+* RubyGems 3.8.0.dev
+* bundler 2.8.0.dev
 * erb 5.0.2
 * etc 1.4.6
 * io-console 0.8.1
 * io-nonblock 0.3.2
+* io-wait 0.3.2
 * json 2.12.2
 * optparse 0.7.0.dev.2
 * prism 1.4.0
@@ -228,6 +229,7 @@ The following bundled gems are updated.
 
 ## JIT
 
+[Feature #17473]: https://bugs.ruby-lang.org/issues/17473
 [Feature #18455]: https://bugs.ruby-lang.org/issues/18455
 [Feature #19908]: https://bugs.ruby-lang.org/issues/19908
 [Feature #20610]: https://bugs.ruby-lang.org/issues/20610
@@ -241,4 +243,3 @@ The following bundled gems are updated.
 [Feature #21262]: https://bugs.ruby-lang.org/issues/21262
 [Feature #21287]: https://bugs.ruby-lang.org/issues/21287
 [Feature #21347]: https://bugs.ruby-lang.org/issues/21347
-[Feature #17473]: https://bugs.ruby-lang.org/issues/17473

configure.ac

@@ -2815,12 +2815,12 @@ AS_IF([test "$THREAD_MODEL" = pthread], [
     ], [
 	AC_DEFINE(NON_SCALAR_THREAD_ID)
     ])
-    AC_CHECK_FUNCS([sched_yield pthread_attr_setinheritsched
-	pthread_attr_get_np pthread_attr_getstack pthread_attr_getguardsize
-	pthread_get_stackaddr_np pthread_get_stacksize_np
-	thr_stksegment pthread_stackseg_np pthread_getthrds_np
-	pthread_condattr_setclock
-	pthread_setname_np pthread_set_name_np])
+    AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
+	pthread_attr_get_np pthread_attr_getstack pthread_attr_getguardsize \
+	pthread_get_stackaddr_np pthread_get_stacksize_np \
+	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
+	pthread_condattr_setclock \
+	pthread_setname_np pthread_set_name_np)
     AS_CASE(["$target_os"],[emscripten*],[ac_cv_func_pthread_sigmask=no],[AC_CHECK_FUNCS(pthread_sigmask)])
     AS_CASE(["$target_os"],[aix*],[ac_cv_func_pthread_getattr_np=no],[AC_CHECK_FUNCS(pthread_getattr_np)])
     set_current_thread_name=

defs/jit.mk

@@ -7,6 +7,12 @@
 RUST_LIB_TOUCH = touch $@
 
 ifneq ($(JIT_CARGO_SUPPORT),no)
+
+# Show Cargo progress when doing `make V=1`
+CARGO_VERBOSE_0 = -q
+CARGO_VERBOSE_1 =
+CARGO_VERBOSE = $(CARGO_VERBOSE_$(V))
+
 # NOTE: MACOSX_DEPLOYMENT_TARGET to match `rustc --print deployment-target` to avoid the warning below.
 #    ld: warning: object file (target/debug/libjit.a(<libcapstone object>)) was built for
 #    newer macOS version (15.2) than being linked (15.0)