Merge remote-tracking branch 'upstream/master' into Ractor-Local-GC-version-1.2

Author: rm155

.github/workflows/codeql-analysis.yml

@@ -50,6 +50,7 @@ jobs:
 
     env:
       enable_install_doc: no
+      CODEQL_ACTION_CLEANUP_TRAP_CACHES: true
 
     strategy:
       fail-fast: false

.github/workflows/windows.yml

@@ -88,13 +88,6 @@ jobs:
           scoop install vcpkg uutils-coreutils cmake@3.31.6
         shell: pwsh
 
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           sparse-checkout-cone-mode: false
@@ -140,12 +133,17 @@ jobs:
         run: Get-Volume
         shell: pwsh
 
+        # vcpkg built-in cache is not working now
+      - name: Restore vcpkg artifact
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        with:
+          path: C:\Users\runneradmin\AppData\Local\vcpkg\archives
+          key: windows-${{ matrix.os }}-vcpkg-${{ hashFiles('src/vcpkg.json') }}
+
       - name: Install libraries with vcpkg
         run: |
-          vcpkg install
+          vcpkg install --vcpkg-root=C:\Users\runneradmin\scoop\apps\vcpkg\current
         working-directory: src
-        env:
-          VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
       # TODO: We should use `../src` instead of `D:/a/ruby/ruby/src`
       - name: Configure

NEWS.md

@@ -43,7 +43,7 @@ The following bundled gems are promoted from default gems.
 * irb 1.15.2
 * reline 0.6.1
 * readline 0.0.4
-* fiddle 1.1.6
+* fiddle 1.1.8
 
 We only list stdlib changes that are notable feature changes.
 
@@ -58,7 +58,7 @@ The following default gems are updated.
 * RubyGems 3.7.0.dev
 * bundler 2.7.0.dev
 * cgi 0.4.2
-* json 2.10.2
+* json 2.11.2
 * optparse 0.7.0.dev.2
 * prism 1.4.0
 * psych 5.2.3

doc/syntax/exceptions.rdoc

@@ -103,4 +103,4 @@ You may also run some code when an exception is not raised:
     # It will not return implicitly.
   end
 
-NB : Without explicit +return+ in the +ensure+ block, +begin+/+end+ block will return the last evaluated statement before entering in the `ensure` block.
+NB : Without explicit +return+ in the +ensure+ block, +begin+/+end+ block will return the last evaluated statement before entering in the +ensure+ block.

doc/zjit.md

@@ -89,5 +89,5 @@ make test-all TESTS="test/ruby/test_zjit.rb"
 You can also run a single test case by matching the method name:
 
 ```
-make test-all TESTS="test/ruby/test_zjit.rb -n test_putobject"
+make test-all TESTS="test/ruby/test_zjit.rb -n TestZJIT#test_putobject"
 ```

ext/json/lib/json/common.rb

@@ -919,6 +919,68 @@ def dump(obj, anIO = nil, limit = nil, kwargs = nil)
     end
   end
 
+  # :stopdoc:
+  # All these were meant to be deprecated circa 2009, but were just set as undocumented
+  # so usage still exist in the wild.
+  def unparse(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1, category: :deprecated
+    else
+      warn "JSON.unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1
+    end
+    generate(...)
+  end
+  module_function :unparse
+
+  def fast_unparse(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.fast_unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1, category: :deprecated
+    else
+      warn "JSON.fast_unparse is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1
+    end
+    generate(...)
+  end
+  module_function :fast_unparse
+
+  def pretty_unparse(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.pretty_unparse is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1, category: :deprecated
+    else
+      warn "JSON.pretty_unparse is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1
+    end
+    pretty_generate(...)
+  end
+  module_function :fast_unparse
+
+  def restore(...)
+    if RUBY_VERSION >= "3.0"
+      warn "JSON.restore is deprecated and will be removed in json 3.0.0, just use JSON.load", uplevel: 1, category: :deprecated
+    else
+      warn "JSON.restore is deprecated and will be removed in json 3.0.0, just use JSON.load", uplevel: 1
+    end
+    load(...)
+  end
+  module_function :restore
+
+  class << self
+    private
+
+    def const_missing(const_name)
+      case const_name
+      when :PRETTY_STATE_PROTOTYPE
+        if RUBY_VERSION >= "3.0"
+          warn "JSON::PRETTY_STATE_PROTOTYPE is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1, category: :deprecated
+        else
+          warn "JSON::PRETTY_STATE_PROTOTYPE is deprecated and will be removed in json 3.0.0, just use JSON.pretty_generate", uplevel: 1
+        end
+        state.new(PRETTY_GENERATE_OPTIONS)
+      else
+        super
+      end
+    end
+  end
+  # :startdoc:
+
   # JSON::Coder holds a parser and generator configuration.
   #
   #   module MyApp

ext/json/lib/json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSON
-  VERSION = '2.10.2'
+  VERSION = '2.11.2'
 end

gc/default/default.c

@@ -7146,18 +7146,24 @@ rb_gc_impl_writebarrier_remember(void *objspace_ptr, VALUE obj)
     }
 }
 
-#define RB_GC_OBJECT_METADATA_ENTRY_COUNT 7
+struct rb_gc_object_metadata_names {
+    // Must be ID only
+    ID ID_wb_protected, ID_age, ID_old, ID_uncollectible, ID_marking,
+        ID_marked, ID_pinned, ID_object_id, ID_shareable;
+};
+
+#define RB_GC_OBJECT_METADATA_ENTRY_COUNT (sizeof(struct rb_gc_object_metadata_names) / sizeof(ID))
 static struct rb_gc_object_metadata_entry object_metadata_entries[RB_GC_OBJECT_METADATA_ENTRY_COUNT + 1];
 
 struct rb_gc_object_metadata_entry *
 rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
 {
     rb_objspace_t *objspace = objspace_ptr;
     size_t n = 0;
-    static ID ID_wb_protected, ID_age, ID_old, ID_uncollectible, ID_marking, ID_marked, ID_pinned, ID_object_id;
+    static struct rb_gc_object_metadata_names names;
 
-    if (!ID_marked) {
-#define I(s) ID_##s = rb_intern(#s);
+    if (!names.ID_marked) {
+#define I(s) names.ID_##s = rb_intern(#s)
         I(wb_protected);
         I(age);
         I(old);
@@ -7166,12 +7172,13 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
         I(marked);
         I(pinned);
         I(object_id);
+        I(shareable);
 #undef I
     }
 
 #define SET_ENTRY(na, v) do { \
     GC_ASSERT(n <= RB_GC_OBJECT_METADATA_ENTRY_COUNT); \
-    object_metadata_entries[n].name = ID_##na; \
+    object_metadata_entries[n].name = names.ID_##na; \
     object_metadata_entries[n].val = v; \
     n++; \
 } while (0)
@@ -7184,6 +7191,7 @@ rb_gc_impl_object_metadata(void *objspace_ptr, VALUE obj)
     if (RVALUE_MARKED(obj)) SET_ENTRY(marked, Qtrue);
     if (RVALUE_PINNED(objspace, obj)) SET_ENTRY(pinned, Qtrue);
     if (FL_TEST(obj, FL_SEEN_OBJ_ID)) SET_ENTRY(object_id, rb_obj_id(obj));
+    if (FL_TEST(obj, FL_SHAREABLE)) SET_ENTRY(shareable, Qtrue);
 
     object_metadata_entries[n].name = 0;
     object_metadata_entries[n].val = 0;

gems/bundled_gems

@@ -44,4 +44,4 @@ win32ole            1.9.2   https://github.com/ruby/win32ole
 irb                 1.15.2  https://github.com/ruby/irb
 reline              0.6.1   https://github.com/ruby/reline
 readline            0.0.4   https://github.com/ruby/readline
-fiddle              1.1.6   https://github.com/ruby/fiddle
+fiddle              1.1.8   https://github.com/ruby/fiddle

lib/bundler/fetcher.rb

@@ -2,7 +2,6 @@
 
 require_relative "vendored_persistent"
 require_relative "vendored_timeout"
-require "cgi"
 require_relative "vendored_securerandom"
 require "zlib"