turkdevops · pull · Dec 12, 2025 · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025
diff --git a/.github/auto_request_review.yml b/.github/auto_request_review.yml
@@ -2,16 +2,15 @@ files:
   'yjit*': [team:jit]
   'yjit/**/*': [team:jit]
   'yjit/src/cruby_bindings.inc.rs': []
-  'doc/yjit/*': [team:jit]
   'bootstraptest/test_yjit*': [team:jit]
   'test/ruby/test_yjit*': [team:jit]
   'zjit*': [team:jit]
   'zjit/**/*': [team:jit]
   'zjit/src/cruby_bindings.inc.rs': []
-  'doc/zjit*': [team:jit]
   'test/ruby/test_zjit*': [team:jit]
   'defs/jit.mk': [team:jit]
   'tool/zjit_bisect.rb': [team:jit]
+  'doc/jit/*': [team:jit]
   # Skip github workflow files because the team don't necessarily need to review dependabot updates for GitHub Actions. It's noisy in notifications, and they're auto-merged anyway.
 options:
   ignore_draft: true

diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb
@@ -1169,7 +1169,8 @@ class C
 # Inserting into the id2ref table should be Ractor-safe
 assert_equal 'ok', <<~'RUBY'
   # Force all calls to Kernel#object_id to insert into the id2ref table
-  ObjectSpace._id2ref(Object.new.object_id)
+  obj = Object.new
+  ObjectSpace._id2ref(obj.object_id) rescue nil
 
   10.times.map do
     Ractor.new do

diff --git a/configure.ac b/configure.ac
@@ -3957,7 +3957,7 @@ AC_ARG_ENABLE(zjit,
     [AS_CASE(["$JIT_TARGET_OK"],
         [yes], [
             rb_zjit_build_possible=no
-            AC_MSG_CHECKING([possible to build ZJIT])dnl only checked when --enable-zjit is not specified
+            AC_MSG_CHECKING([prerequisites for ZJIT])dnl only checked when --enable-zjit is not specified
             # Fails in case rustc target doesn't match ruby target. Can happen on Rosetta, for example.
             # 1.85.0 is the first stable version that supports the 2024 edition.
             AS_IF([test "$RUSTC" != "no" && echo "#[cfg(target_arch = \"$JIT_TARGET_ARCH\")] fn main() {}" |
@@ -4051,44 +4051,44 @@ AS_CASE(["${ZJIT_SUPPORT}"],
 JIT_RUST_FLAGS='--crate-type=staticlib --cfg feature=\"stats_allocator\"'
 RLIB_DIR=
 AS_CASE(["$JIT_CARGO_SUPPORT:$YJIT_SUPPORT:$ZJIT_SUPPORT"],
-    [no:yes:yes], [ # release build of YJIT+ZJIT
-        YJIT_LIBS=
-        ZJIT_LIBS=
-        JIT_RUST_FLAGS="--crate-type=rlib"
-        RLIB_DIR="target/release"
-        RUST_LIB="target/release/libruby.a"
-    ],
-    [no:*], [],
-    [*], [ # JIT_CARGO_SUPPORT not "no" -- cargo required.
-        AC_CHECK_TOOL(CARGO, [cargo], [no])
-        AS_IF([test x"$CARGO" = "xno"],
-            AC_MSG_ERROR([this build configuration requires cargo. Installation instructions available at https://www.rust-lang.org/tools/install]))
-
-        YJIT_LIBS=
-        ZJIT_LIBS=
-
-        # There's more processing below to get the feature set for the
-        # top-level crate, so capture at this point for feature set of
-        # just the zjit crate.
-        ZJIT_TEST_FEATURES="${rb_cargo_features}"
-
-        AS_IF([test x"${YJIT_SUPPORT}" != x"no"], [
-            rb_cargo_features="$rb_cargo_features,yjit"
-        ])
-        AS_IF([test x"${ZJIT_SUPPORT}" != x"no"], [
-            AC_SUBST(ZJIT_TEST_FEATURES)
-            rb_cargo_features="$rb_cargo_features,zjit"
-        ])
-        # if YJIT and ZJIT release mode
-        AS_IF([test "${YJIT_SUPPORT}:${ZJIT_SUPPORT}" = "yes:yes"], [
-            JIT_CARGO_SUPPORT=release
-        ])
-        CARGO_BUILD_ARGS="--profile ${JIT_CARGO_SUPPORT} --features ${rb_cargo_features}"
-        AS_IF([test "${JIT_CARGO_SUPPORT}" = "dev"], [
-            RUST_LIB="target/debug/libruby.a"
-        ], [
-            RUST_LIB="target/${JIT_CARGO_SUPPORT}/libruby.a"
-        ])
+[no:yes:yes], [ # release build of YJIT+ZJIT
+    YJIT_LIBS=
+    ZJIT_LIBS=
+    JIT_RUST_FLAGS="--crate-type=rlib"
+    RLIB_DIR="target/release"
+    RUST_LIB="target/release/libruby.a"
+],
+[no:*], [],
+[ # JIT_CARGO_SUPPORT not "no" -- cargo required.
+    AC_CHECK_TOOL(CARGO, [cargo], [no])
+    AS_IF([test x"$CARGO" = "xno"],
+        AC_MSG_ERROR([this build configuration requires cargo. Installation instructions available at https://www.rust-lang.org/tools/install]))
+
+    YJIT_LIBS=
+    ZJIT_LIBS=
+
+    # There's more processing below to get the feature set for the
+    # top-level crate, so capture at this point for feature set of
+    # just the zjit crate.
+    ZJIT_TEST_FEATURES="${rb_cargo_features}"
+
+    AS_IF([test x"${YJIT_SUPPORT}" != x"no"], [
+        rb_cargo_features="$rb_cargo_features,yjit"
+    ])
+    AS_IF([test x"${ZJIT_SUPPORT}" != x"no"], [
+        AC_SUBST(ZJIT_TEST_FEATURES)
+        rb_cargo_features="$rb_cargo_features,zjit"
+    ])
+    # if YJIT and ZJIT release mode
+    AS_IF([test "${YJIT_SUPPORT}:${ZJIT_SUPPORT}" = "yes:yes"], [
+        JIT_CARGO_SUPPORT=release
+    ])
+    CARGO_BUILD_ARGS="--profile ${JIT_CARGO_SUPPORT} --features ${rb_cargo_features}"
+    AS_IF([test "${JIT_CARGO_SUPPORT}" = "dev"], [
+        RUST_LIB="target/debug/libruby.a"
+    ], [
+        RUST_LIB="target/${JIT_CARGO_SUPPORT}/libruby.a"
+    ])
 ])
 
 # In case either we're linking rust code

diff --git a/doc/jit/zjit.md b/doc/jit/zjit.md
@@ -13,6 +13,10 @@ You can change how much executable memory is allocated using [ZJIT's command-lin
 
 ## Build Instructions
 
+Refer to [Building Ruby](rdoc-ref:contributing/building_ruby.md) for general build prerequists.
+Additionally, ZJIT requires Rust 1.85.0 or later. Release builds need only `rustc`. Development
+builds require `cargo` and may download dependencies.
+
 ### For normal use
 
 To build ZJIT on macOS:

diff --git a/eval.c b/eval.c
@@ -1133,12 +1133,11 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int *pstate)
 }
 
 VALUE
-rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2)
+rb_ec_ensure(rb_execution_context_t *ec, VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2)
 {
     enum ruby_tag_type state;
     volatile VALUE result = Qnil;
     VALUE errinfo;
-    rb_execution_context_t * volatile ec = GET_EC();
     EC_PUSH_TAG(ec);
     if ((state = EC_EXEC_TAG()) == TAG_NONE) {
         result = (*b_proc) (data1);
@@ -1155,6 +1154,12 @@ rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE dat
     return result;
 }
 
+VALUE
+rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2)
+{
+    return rb_ec_ensure(GET_EC(), b_proc, data1, e_proc, data2);
+}
+
 static ID
 frame_func_id(const rb_control_frame_t *cfp)
 {

diff --git a/ext/monitor/monitor.c b/ext/monitor/monitor.c
@@ -148,7 +148,7 @@ monitor_check_owner(VALUE monitor)
 static void
 monitor_exit0(struct monitor_args *args)
 {
-    monitor_check_owner(args->monitor);
+    monitor_check_owner0(args);
 
     if (args->mc->count <= 0) rb_bug("monitor_exit: count:%d", (int)args->mc->count);
     args->mc->count--;

diff --git a/internal/eval.h b/internal/eval.h
@@ -11,6 +11,7 @@
  *             header (related to this file, but not the same role).
  */
 #include "ruby/ruby.h"          /* for ID */
+#include "vm_core.h"          /* for ID */
 
 #define id_signo ruby_static_id_signo
 #define id_status ruby_static_id_status
@@ -30,6 +31,7 @@ VALUE rb_exception_setup(int argc, VALUE *argv);
 void rb_refinement_setup(struct rb_refinements_data *data, VALUE module, VALUE klass);
 void rb_vm_using_module(VALUE module);
 VALUE rb_top_main_class(const char *method);
+VALUE rb_ec_ensure(rb_execution_context_t *ec, VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2);
 
 /* eval_error.c */
 VALUE rb_get_backtrace(VALUE info);

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
@@ -1319,4 +1319,10 @@ def test_free_at_exit_env_var
   def test_toplevel_ruby
     assert_instance_of Module, ::Ruby
   end
+
+  def test_ruby_patchlevel
+    # We stopped bumping RUBY_PATCHLEVEL at Ruby 4.0.0.
+    # Released versions have RUBY_PATCHLEVEL 0, and un-released versions have -1.
+    assert_include [-1, 0], RUBY_PATCHLEVEL
+  end
 end
diff --git a/test/test_timeout.rb b/test/test_timeout.rb
@@ -6,8 +6,10 @@ class TestTimeout < Test::Unit::TestCase
 
   private def kill_timeout_thread
     thread = Timeout.const_get(:State).instance.instance_variable_get(:@timeout_thread)
-    thread.kill
-    thread.join
+    if thread
+      thread.kill
+      thread.join
+    end
   end
 
   def test_public_methods
@@ -425,7 +427,9 @@ def test_timeout_in_trap_handler
 
     rd, wr = IO.pipe
 
-    trap("SIGUSR1") do
+    signal = Signal.list["USR1"] ? :USR1 : :TERM
+
+    trap(signal) do
       begin
         Timeout.timeout(0.1) do
           sleep 1
@@ -440,7 +444,7 @@ def test_timeout_in_trap_handler
       end
     end
 
-    Process.kill :USR1, Process.pid
+    Process.kill signal, Process.pid
 
     assert_equal "OK", rd.read
     rd.close