Merge branch 'master' into zjit-framestate-getlocal

Author: XrXr

.github/actions/compilers/action.yml

@@ -5,7 +5,7 @@ description: >-
 inputs:
   tag:
     required: false
-    default: clang-18
+    default: clang-20
     description: >-
       container image tag to use in this run.
 

.github/workflows/compilers.yml

@@ -109,7 +109,8 @@ jobs:
       - { uses: './.github/actions/compilers', name: 'clang 21', with: { tag: 'clang-21' } }
       - { uses: './.github/actions/compilers', name: 'clang 20', with: { tag: 'clang-20' } }
       - { uses: './.github/actions/compilers', name: 'clang 19', with: { tag: 'clang-19' } }
-      - { uses: './.github/actions/compilers', name: 'clang 18', with: { tag: 'clang-18' } }
+      # clang-18 has a bug causing ruby_current_ec to sometimes be null
+      # - { uses: './.github/actions/compilers', name: 'clang 18', with: { tag: 'clang-18' } }
       - { uses: './.github/actions/compilers', name: 'clang 17', with: { tag: 'clang-17' } }
       - { uses: './.github/actions/compilers', name: 'clang 16', with: { tag: 'clang-16' } }
       - { uses: './.github/actions/compilers', name: 'clang 15', with: { tag: 'clang-15' } }

.github/workflows/macos.yml

@@ -45,7 +45,6 @@ jobs:
             os: macos-14
           - test_task: check
             os: macos-15
-            extra_checks: [capi]
       fail-fast: false
 
     env:

.github/workflows/windows.yml

@@ -81,7 +81,7 @@ jobs:
           Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
           iwr -useb get.scoop.sh | iex
           Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
-          scoop install vcpkg uutils-coreutils cmake@3.31.6
+          scoop install vcpkg uutils-coreutils
         shell: pwsh
 
       - name: Restore vcpkg artifact

bootstraptest/test_ractor.rb

@@ -2350,3 +2350,23 @@ def call_test(obj)
   end
   :ok
 RUBY
+
+assert_equal 'ok', <<~'RUBY'
+  begin
+    100.times do |i|
+      Ractor.new(i) do |j|
+        1000.times do |i|
+          "#{j}-#{i}"
+        end
+        Ractor.receive
+      end
+      pid = fork { }
+      _, status = Process.waitpid2 pid
+      raise unless status.success?
+    end
+
+    :ok
+  rescue NotImplementedError
+    :ok
+  end
+RUBY

box.c

@@ -1047,17 +1047,16 @@ rb_f_dump_classext(VALUE recv, VALUE klass)
 /*
  *  Document-class: Ruby::Box
  *
- *  Ruby::Box is designed to provide separated spaces in a Ruby
- *  process, to isolate applications and libraries.
- *  See {Ruby::Box}[rdoc-ref:box.md].
+ *  :markup: markdown
+ *  :include: doc/_box.md
  */
 void
 Init_Box(void)
 {
     tmp_dir = system_tmpdir();
     tmp_dir_has_dirsep = (strcmp(tmp_dir + (strlen(tmp_dir) - strlen(DIRSEP)), DIRSEP) == 0);
 
-    VALUE mRuby = rb_path2class("Ruby");
+    VALUE mRuby = rb_define_module("Ruby");
 
     rb_cBox = rb_define_class_under(mRuby, "Box", rb_cModule);
     rb_define_method(rb_cBox, "initialize", box_initialize, 0);

class.c

@@ -183,6 +183,12 @@ rb_class_set_box_classext(VALUE obj, const rb_box_t *box, rb_classext_t *ext)
     };
 
     st_update(RCLASS_CLASSEXT_TBL(obj), (st_data_t)box->box_object, rb_class_set_box_classext_update, (st_data_t)&args);
+
+    // FIXME: This is done here because this is the first time the objects in
+    // the classext are exposed via this class. It's likely that if GC
+    // compaction occurred between the VALUEs being copied in and this
+    // writebarrier trigger the values will be stale.
+    rb_gc_writebarrier_remember(obj);
 }
 
 RUBY_EXTERN rb_serial_t ruby_vm_global_cvar_state;

common.mk

@@ -46,7 +46,7 @@ RUN_OPTS      = --disable-gems
 
 GIT_IN_SRC    = $(GIT) -C $(srcdir)
 GIT_LOG       = $(GIT_IN_SRC) log --no-show-signature
-GIT_LOG_FORMAT = $(GIT_LOG) --pretty=format:
+GIT_LOG_FORMAT = $(GIT_LOG) "--pretty=format:"
 
 # GITPULLOPTIONS = --no-tags
 

complex.c

@@ -913,15 +913,16 @@ comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE
 
 /*
  * call-seq:
- *   complex * numeric -> new_complex
+ *   self * other -> numeric
  *
- * Returns the product of +self+ and +numeric+:
+ * Returns the numeric product of +self+ and +other+:
  *
+ *   Complex.rect(9, 8)  * 4                   # => (36+32i)
+ *   Complex.rect(20, 9) * 9.8                 # => (196.0+88.2i)
  *   Complex.rect(2, 3)  * Complex.rect(2, 3)  # => (-5+12i)
  *   Complex.rect(900)   * Complex.rect(1)     # => (900+0i)
  *   Complex.rect(-2, 9) * Complex.rect(-9, 2) # => (0-85i)
- *   Complex.rect(9, 8)  * 4                   # => (36+32i)
- *   Complex.rect(20, 9) * 9.8                 # => (196.0+88.2i)
+ *   Complex.rect(9, 8)  * Rational(2, 3)      # => ((6/1)+(16/3)*i)
  *
  */
 VALUE

cont.c

@@ -268,6 +268,8 @@ struct rb_fiber_struct {
 
     unsigned int killed : 1;
 
+    rb_serial_t serial;
+
     struct coroutine_context context;
     struct fiber_pool_stack stack;
 };
@@ -1010,6 +1012,13 @@ rb_fiber_threadptr(const rb_fiber_t *fiber)
     return fiber->cont.saved_ec.thread_ptr;
 }
 
+rb_serial_t
+rb_fiber_serial(const rb_fiber_t *fiber)
+{
+    VM_ASSERT(fiber->serial >= 1);
+    return fiber->serial;
+}
+
 static VALUE
 cont_thread_value(const rb_context_t *cont)
 {
@@ -1995,6 +2004,13 @@ fiber_alloc(VALUE klass)
     return TypedData_Wrap_Struct(klass, &fiber_data_type, 0);
 }
 
+static rb_serial_t
+next_fiber_serial(void)
+{
+    static rbimpl_atomic_uint64_t fiber_serial = 1;
+    return (rb_serial_t)ATOMIC_U64_FETCH_ADD(fiber_serial, 1);
+}
+
 static rb_fiber_t*
 fiber_t_alloc(VALUE fiber_value, unsigned int blocking)
 {
@@ -2011,6 +2027,7 @@ fiber_t_alloc(VALUE fiber_value, unsigned int blocking)
     fiber->cont.type = FIBER_CONTEXT;
     fiber->blocking = blocking;
     fiber->killed = 0;
+    fiber->serial = next_fiber_serial();
     cont_init(&fiber->cont, th);
 
     fiber->cont.saved_ec.fiber_ptr = fiber;
@@ -2563,6 +2580,7 @@ rb_threadptr_root_fiber_setup(rb_thread_t *th)
     fiber->cont.saved_ec.thread_ptr = th;
     fiber->blocking = 1;
     fiber->killed = 0;
+    fiber->serial = next_fiber_serial();
     fiber_status_set(fiber, FIBER_RESUMED); /* skip CREATED */
     th->ec = &fiber->cont.saved_ec;
     cont_init_jit_cont(&fiber->cont);