From 1ad990a366a343a84c089b771be4fe6ff80b5078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 10 Oct 2024 19:30:26 +0200
Subject: [PATCH 001/140] [rubygems/rubygems] Only pristine executables for
 default gems

https://github.com/rubygems/rubygems/commit/1cfc1d626c
---
 lib/rubygems/commands/pristine_command.rb      | 18 +++++++++++++++---
 .../test_gem_commands_pristine_command.rb      | 15 +++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 96e48df4e61aa3..ec791d310a2800 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -137,6 +137,13 @@ def execute
     specs.group_by(&:full_name_with_location).values.each do |grouped_specs|
       spec = grouped_specs.find {|s| !s.default_gem? } || grouped_specs.first
 
+      unless only_executables_or_plugins?
+        # Default gemspecs include changes provided by ruby-core installer that
+        # can't currently be pristined (inclusion of compiled extension targets in
+        # the file list). So stick to resetting executables if it's a default gem.
+        options[:only_executables] = true if spec.default_gem?
+      end
+
       if options.key? :skip
         if options[:skip].include? spec.name
           say "Skipped #{spec.full_name}, it was given through options"
@@ -144,14 +151,14 @@ def execute
         end
       end
 
-      unless spec.extensions.empty? || options[:extensions] || options[:only_executables] || options[:only_plugins]
+      unless spec.extensions.empty? || options[:extensions] || only_executables_or_plugins?
         say "Skipped #{spec.full_name_with_location}, it needs to compile an extension"
         next
       end
 
       gem = spec.cache_file
 
-      unless File.exist?(gem) || options[:only_executables] || options[:only_plugins]
+      unless File.exist?(gem) || only_executables_or_plugins?
         require_relative "../remote_fetcher"
 
         say "Cached gem for #{spec.full_name_with_location} not found, attempting to fetch..."
@@ -185,7 +192,6 @@ def execute
         env_shebang: env_shebang,
         build_args: spec.build_args,
         bin_dir: bin_dir,
-        install_as_default: spec.default_gem?,
       }
 
       if options[:only_executables]
@@ -202,4 +208,10 @@ def execute
       say "Restored #{spec.full_name_with_location}"
     end
   end
+
+  private
+
+  def only_executables_or_plugins?
+    options[:only_executables] || options[:only_plugins]
+  end
 end
diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
index 190f78c79f39c3..2a715921b33d32 100644
--- a/test/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -630,8 +630,16 @@ def test_execute_unknown_gem_at_remote_source
 
   def test_execute_default_gem
     default_gem_spec = new_default_spec("default", "2.0.0.0",
-                                        nil, "default/gem.rb")
-    install_default_gems(default_gem_spec)
+                                        nil, "exe/executable")
+    default_gem_spec.executables = "executable"
+    install_default_gems default_gem_spec
+
+    exe = File.join @gemhome, "bin", "executable"
+
+    assert_path_exist exe, "default gem's executable not installed"
+
+    content_with_replaced_shebang = File.read(exe).gsub(/^#![^\n]+ruby/, "#!/usr/bin/env ruby_executable_hooks")
+    File.write(exe, content_with_replaced_shebang)
 
     @cmd.options[:args] = %w[default]
 
@@ -642,8 +650,7 @@ def test_execute_default_gem
     assert_equal(
       [
         "Restoring gems to pristine condition...",
-        "Cached gem for default-2.0.0.0 not found, attempting to fetch...",
-        "Skipped default-2.0.0.0, it was not found from cache and remote sources",
+        "Restored default-2.0.0.0",
       ],
       @ui.output.split("\n")
     )

From 09100508e66694cdc3fb8c0867cf56b2fbfb1ceb Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Thu, 10 Oct 2024 15:03:40 -0500
Subject: [PATCH 002/140] [DOC] Tweaks for Array#reverse_each (#11855)

---
 array.c | 46 +++++++++++++---------------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/array.c b/array.c
index d28f03cb4c81ea..2a2893cffeec35 100644
--- a/array.c
+++ b/array.c
@@ -2633,6 +2633,7 @@ rb_ary_each(VALUE ary)
  *
  *    a = [:foo, 'bar', 2]
  *    a.each_index {|index| puts index; a.clear if index > 0 }
+ *    a # => []
  *
  *  Output:
  *
@@ -2658,47 +2659,26 @@ rb_ary_each_index(VALUE ary)
 
 /*
  *  call-seq:
- *    array.reverse_each {|element| ... } -> self
- *    array.reverse_each -> Enumerator
+ *    reverse_each {|element| ... } -> self
+ *    reverse_each -> Enumerator
  *
- *  Iterates backwards over array elements.
- *
- *  When a block given, passes, in reverse order, each element to the block;
+ *  When a block given, iterates backwards over the elements of +self+,
+ *  passing, in reverse order, each element to the block;
  *  returns +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.reverse_each {|element|  puts "#{element.class} #{element}" }
- *
- *  Output:
- *
- *    Integer 2
- *    String bar
- *    Symbol foo
+ *    a = []
+ *    [0, 1, 2].reverse_each {|element| a.push(element) }
+ *    a # => [2, 1, 0]
  *
  *  Allows the array to be modified during iteration:
  *
- *    a = [:foo, 'bar', 2]
- *    a.reverse_each {|element| puts element; a.clear if element.to_s.start_with?('b') }
- *
- *  Output:
- *
- *    2
- *    bar
- *
- *  When no block given, returns a new Enumerator:
- *
- *    a = [:foo, 'bar', 2]
- *    e = a.reverse_each
- *    e # => #<Enumerator: [:foo, "bar", 2]:reverse_each>
- *    a1 = e.each {|element|  puts "#{element.class} #{element}" }
- *
- *  Output:
+ *    a = ['a', 'b', 'c']
+ *    a.reverse_each {|element| a.clear if element.start_with?('b') }
+ *    a # => []
  *
- *    Integer 2
- *    String bar
- *    Symbol foo
+ *  When no block given, returns a new Enumerator.
  *
- *  Related: #each, #each_index.
+ *  Related: see {Methods for Iterating}[rdoc-ref:Array@Methods+for+Iterating].
  */
 
 static VALUE

From c43be94f76982d3ffa2ecd28d34172600b81ca31 Mon Sep 17 00:00:00 2001
From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
Date: Fri, 11 Oct 2024 18:36:11 +1300
Subject: [PATCH 003/140] Update `rsock_connect` to take `VALUE io` argument.
 (#11847)

---
 ext/socket/init.c       | 16 ++++++------
 ext/socket/ipsocket.c   | 55 +++++++++++++++++++++++------------------
 ext/socket/rubysocket.h |  4 +--
 ext/socket/socket.c     |  9 +++----
 ext/socket/udpsocket.c  | 54 +++++++++++++++++++---------------------
 ext/socket/unixsocket.c | 36 ++++++++++++++-------------
 6 files changed, 88 insertions(+), 86 deletions(-)

diff --git a/ext/socket/init.c b/ext/socket/init.c
index 90870fec6915a8..b02ac5fef5748f 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -578,19 +578,19 @@ socks_connect_blocking(void *data)
 #endif
 
 int
-rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout)
+rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout)
 {
-    int status;
+    int descriptor = rb_io_descriptor(self);
     rb_blocking_function_t *func = connect_blocking;
-    struct connect_arg arg;
+    struct connect_arg arg = {.fd = descriptor, .sockaddr = sockaddr, .len = len};
+
+    rb_io_t *fptr;
+    RB_IO_POINTER(self, fptr);
 
-    arg.fd = fd;
-    arg.sockaddr = sockaddr;
-    arg.len = len;
 #if defined(SOCKS) && !defined(SOCKS5)
     if (socks) func = socks_connect_blocking;
 #endif
-    status = (int)BLOCKING_REGION_FD(func, &arg);
+    int status = (int)rb_io_blocking_region(fptr, func, &arg);
 
     if (status < 0) {
         switch (errno) {
@@ -602,7 +602,7 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struc
 #ifdef EINPROGRESS
           case EINPROGRESS:
 #endif
-            return wait_connectable(fd, timeout);
+            return wait_connectable(descriptor, timeout);
         }
     }
     return status;
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index d94584c90baae1..7992212b87c324 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -9,16 +9,18 @@
 ************************************************/
 
 #include "rubysocket.h"
+#include <stdio.h>
 
 struct inetsock_arg
 {
-    VALUE sock;
+    VALUE self;
+    VALUE io;
+
     struct {
         VALUE host, serv;
         struct rb_addrinfo *res;
     } remote, local;
     int type;
-    int fd;
     VALUE resolv_timeout;
     VALUE connect_timeout;
 };
@@ -35,8 +37,9 @@ inetsock_cleanup(VALUE v)
         rb_freeaddrinfo(arg->local.res);
         arg->local.res = 0;
     }
-    if (arg->fd >= 0) {
-        close(arg->fd);
+    if (arg->io != Qnil) {
+        rb_io_close(arg->io);
+        arg->io = Qnil;
     }
     return Qnil;
 }
@@ -48,7 +51,7 @@ init_inetsock_internal(VALUE v)
     int error = 0;
     int type = arg->type;
     struct addrinfo *res, *lres;
-    int fd, status = 0, local = 0;
+    int status = 0, local = 0;
     int family = AF_UNSPEC;
     const char *syscall = 0;
     VALUE connect_timeout = arg->connect_timeout;
@@ -74,7 +77,8 @@ init_inetsock_internal(VALUE v)
                                         family, SOCK_STREAM, 0);
     }
 
-    arg->fd = fd = -1;
+    VALUE io = Qnil;
+
     for (res = arg->remote.res->ai; res; res = res->ai_next) {
 #if !defined(INET6) && defined(AF_INET6)
         if (res->ai_family == AF_INET6)
@@ -96,12 +100,14 @@ init_inetsock_internal(VALUE v)
         }
         status = rsock_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
         syscall = "socket(2)";
-        fd = status;
-        if (fd < 0) {
+        if (status < 0) {
             error = errno;
             continue;
         }
-        arg->fd = fd;
+
+        int fd = status;
+        io = arg->io = rsock_init_sock(arg->self, fd);
+
         if (type == INET_SERVER) {
 #if !defined(_WIN32) && !defined(__CYGWIN__)
             status = 1;
@@ -124,20 +130,22 @@ init_inetsock_internal(VALUE v)
             }
 
             if (status >= 0) {
-                status = rsock_connect(fd, res->ai_addr, res->ai_addrlen,
-                                       (type == INET_SOCKS), tv);
+                status = rsock_connect(io, res->ai_addr, res->ai_addrlen, (type == INET_SOCKS), tv);
                 syscall = "connect(2)";
             }
         }
 
         if (status < 0) {
             error = errno;
-            close(fd);
-            arg->fd = fd = -1;
+            arg->io = Qnil;
+            rb_io_close(io);
+            io = Qnil;
             continue;
-        } else
+        } else {
             break;
+        }
     }
+
     if (status < 0) {
         VALUE host, port;
 
@@ -152,28 +160,28 @@ init_inetsock_internal(VALUE v)
         rsock_syserr_fail_host_port(error, syscall, host, port);
     }
 
-    arg->fd = -1;
+    // Don't close the socket in `inetsock_cleanup` if we are returning it:
+    arg->io = Qnil;
 
-    if (type == INET_SERVER) {
-        status = listen(fd, SOMAXCONN);
+    if (type == INET_SERVER && io != Qnil) {
+        status = listen(rb_io_descriptor(io), SOMAXCONN);
         if (status < 0) {
             error = errno;
-            close(fd);
+            rb_io_close(io);
             rb_syserr_fail(error, "listen(2)");
         }
     }
 
     /* create new instance */
-    return rsock_init_sock(arg->sock, fd);
+    return io;
 }
 
 VALUE
-rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
-                    VALUE local_host, VALUE local_serv, int type,
-                    VALUE resolv_timeout, VALUE connect_timeout)
+rsock_init_inetsock(VALUE self, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type, VALUE resolv_timeout, VALUE connect_timeout)
 {
     struct inetsock_arg arg;
-    arg.sock = sock;
+    arg.self = self;
+    arg.io = Qnil;
     arg.remote.host = remote_host;
     arg.remote.serv = remote_serv;
     arg.remote.res = 0;
@@ -181,7 +189,6 @@ rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
     arg.local.serv = local_serv;
     arg.local.res = 0;
     arg.type = type;
-    arg.fd = -1;
     arg.resolv_timeout = resolv_timeout;
     arg.connect_timeout = connect_timeout;
     return rb_ensure(init_inetsock_internal, (VALUE)&arg,
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index f486db4262abb3..e4ab412f6e834a 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -298,8 +298,6 @@ int Rconnect();
 
 #include "constdefs.h"
 
-#define BLOCKING_REGION_FD(func, arg) (long)rb_thread_io_blocking_region((func), (arg), (arg)->fd)
-
 #define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v))
 #define SockAddrStringValuePtr(v) rsock_sockaddr_string_value_ptr(&(v))
 #define SockAddrStringValueWithAddrinfo(v, rai_ret) rsock_sockaddr_string_value_with_addrinfo(&(v), &(rai_ret))
@@ -381,7 +379,7 @@ VALUE rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
                                 VALUE ex, enum sock_recv_type from);
 VALUE rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
 
-int rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout);
+int rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout);
 
 VALUE rsock_s_accept(VALUE klass, VALUE io, struct sockaddr *sockaddr, socklen_t *len);
 VALUE rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index c780d77cf6c317..c974aafe55102c 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -391,18 +391,17 @@ sock_connect(VALUE sock, VALUE addr)
 {
     VALUE rai;
     rb_io_t *fptr;
-    int fd, n;
 
     SockAddrStringValueWithAddrinfo(addr, rai);
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
-    fd = fptr->fd;
-    n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0, NULL);
-    if (n < 0) {
+
+    int result = rsock_connect(sock, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0, NULL);
+    if (result < 0) {
         rsock_sys_fail_raddrinfo_or_sockaddr("connect(2)", addr, rai);
     }
 
-    return INT2FIX(n);
+    return INT2FIX(result);
 }
 
 /* :nodoc: */
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index 8aada76b26dc81..c5740d82856705 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -45,22 +45,18 @@ udp_init(int argc, VALUE *argv, VALUE sock)
 
 struct udp_arg
 {
+    VALUE io;
     struct rb_addrinfo *res;
-    rb_io_t *fptr;
 };
 
 static VALUE
 udp_connect_internal(VALUE v)
 {
     struct udp_arg *arg = (void *)v;
-    rb_io_t *fptr;
-    int fd;
     struct addrinfo *res;
 
-    rb_io_check_closed(fptr = arg->fptr);
-    fd = fptr->fd;
     for (res = arg->res->ai; res; res = res->ai_next) {
-        if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0, NULL) >= 0) {
+        if (rsock_connect(arg->io, res->ai_addr, res->ai_addrlen, 0, NULL) >= 0) {
             return Qtrue;
         }
     }
@@ -84,16 +80,17 @@ udp_connect_internal(VALUE v)
  *
  */
 static VALUE
-udp_connect(VALUE sock, VALUE host, VALUE port)
+udp_connect(VALUE self, VALUE host, VALUE port)
 {
-    struct udp_arg arg;
-    VALUE ret;
+    struct udp_arg arg = {.io = self};
+
+    arg.res = rsock_addrinfo(host, port, rsock_fd_family(rb_io_descriptor(self)), SOCK_DGRAM, 0);
+
+    int result = (int)rb_ensure(udp_connect_internal, (VALUE)&arg, rsock_freeaddrinfo, (VALUE)arg.res);
+    if (!result) {
+        rsock_sys_fail_host_port("connect(2)", host, port);
+    }
 
-    GetOpenFile(sock, arg.fptr);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
-    ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
-                    rsock_freeaddrinfo, (VALUE)arg.res);
-    if (!ret) rsock_sys_fail_host_port("connect(2)", host, port);
     return INT2FIX(0);
 }
 
@@ -101,14 +98,13 @@ static VALUE
 udp_bind_internal(VALUE v)
 {
     struct udp_arg *arg = (void *)v;
-    rb_io_t *fptr;
-    int fd;
     struct addrinfo *res;
 
-    rb_io_check_closed(fptr = arg->fptr);
-    fd = fptr->fd;
+    rb_io_t *fptr;
+    RB_IO_POINTER(arg->io, fptr);
+
     for (res = arg->res->ai; res; res = res->ai_next) {
-        if (bind(fd, res->ai_addr, res->ai_addrlen) < 0) {
+        if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
             continue;
         }
         return Qtrue;
@@ -129,22 +125,23 @@ udp_bind_internal(VALUE v)
  *
  */
 static VALUE
-udp_bind(VALUE sock, VALUE host, VALUE port)
+udp_bind(VALUE self, VALUE host, VALUE port)
 {
-    struct udp_arg arg;
-    VALUE ret;
+    struct udp_arg arg = {.io = self};
+
+    arg.res = rsock_addrinfo(host, port, rsock_fd_family(rb_io_descriptor(self)), SOCK_DGRAM, 0);
+
+    int result = rb_ensure(udp_bind_internal, (VALUE)&arg, rsock_freeaddrinfo, (VALUE)arg.res);
+    if (!result) {
+        rsock_sys_fail_host_port("bind(2)", host, port);
+    }
 
-    GetOpenFile(sock, arg.fptr);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
-    ret = rb_ensure(udp_bind_internal, (VALUE)&arg,
-                    rsock_freeaddrinfo, (VALUE)arg.res);
-    if (!ret) rsock_sys_fail_host_port("bind(2)", host, port);
     return INT2FIX(0);
 }
 
 struct udp_send_arg {
-    struct rb_addrinfo *res;
     rb_io_t *fptr;
+    struct rb_addrinfo *res;
     struct rsock_send_arg sarg;
 };
 
@@ -156,7 +153,6 @@ udp_send_internal(VALUE v)
     struct addrinfo *res;
 
     rb_io_check_closed(fptr = arg->fptr);
-
     for (res = arg->res->ai; res; res = res->ai_next) {
       retry:
         arg->sarg.fd = fptr->fd;
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index b08e3bb708c91d..11d7c0451fee96 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -14,15 +14,14 @@
 struct unixsock_arg {
     struct sockaddr_un *sockaddr;
     socklen_t sockaddrlen;
-    int fd;
+    VALUE io;
 };
 
 static VALUE
 unixsock_connect_internal(VALUE a)
 {
     struct unixsock_arg *arg = (struct unixsock_arg *)a;
-    return (VALUE)rsock_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
-                                arg->sockaddrlen, 0, NULL);
+    return (VALUE)rsock_connect(arg->io, (struct sockaddr*)arg->sockaddr, arg->sockaddrlen, 0, NULL);
 }
 
 static VALUE
@@ -51,7 +50,7 @@ unixsock_path_value(VALUE path)
 }
 
 VALUE
-rsock_init_unixsock(VALUE sock, VALUE path, int server)
+rsock_init_unixsock(VALUE self, VALUE path, int server)
 {
     struct sockaddr_un sockaddr;
     socklen_t sockaddrlen;
@@ -73,43 +72,46 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
         rsock_sys_fail_path("socket(2)", path);
     }
 
+    VALUE io = rsock_init_sock(self, fd);
+    RB_IO_POINTER(io, fptr);
+
     if (server) {
         status = bind(fd, (struct sockaddr*)&sockaddr, sockaddrlen);
     }
     else {
-        int prot;
+        int error_tag;
         struct unixsock_arg arg;
         arg.sockaddr = &sockaddr;
         arg.sockaddrlen = sockaddrlen;
-        arg.fd = fd;
-        status = (int)rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
-        if (prot) {
-            close(fd);
-            rb_jump_tag(prot);
+        arg.io = io;
+
+        status = (int)rb_protect(unixsock_connect_internal, (VALUE)&arg, &error_tag);
+
+        if (error_tag) {
+            rb_io_close(io);
+            rb_jump_tag(error_tag);
         }
     }
 
     if (status < 0) {
         int e = errno;
-        close(fd);
+        rb_io_close(io);
         rsock_syserr_fail_path(e, "connect(2)", path);
     }
 
     if (server) {
         if (listen(fd, SOMAXCONN) < 0) {
             int e = errno;
-            close(fd);
+            rb_io_close(io);
             rsock_syserr_fail_path(e, "listen(2)", path);
         }
     }
 
-    rsock_init_sock(sock, fd);
     if (server) {
-        GetOpenFile(sock, fptr);
         fptr->pathv = rb_str_new_frozen(path);
     }
 
-    return sock;
+    return io;
 }
 
 /*
@@ -125,9 +127,9 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
  *
  */
 static VALUE
-unix_init(VALUE sock, VALUE path)
+unix_init(VALUE self, VALUE path)
 {
-    return rsock_init_unixsock(sock, path, 0);
+    return rsock_init_unixsock(self, path, 0);
 }
 
 /*

From 2c3d26cfd70277954e12e3af15432aadff8ad21f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 11 Oct 2024 16:37:51 +0900
Subject: [PATCH 004/140] Fix an implicit conversion that loses integer
 precision

Both `rb_ensure` and `udp_bind_internal` return `VALUE`.
---
 ext/socket/udpsocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index c5740d82856705..c31e9dbf6facac 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -131,7 +131,7 @@ udp_bind(VALUE self, VALUE host, VALUE port)
 
     arg.res = rsock_addrinfo(host, port, rsock_fd_family(rb_io_descriptor(self)), SOCK_DGRAM, 0);
 
-    int result = rb_ensure(udp_bind_internal, (VALUE)&arg, rsock_freeaddrinfo, (VALUE)arg.res);
+    VALUE result = rb_ensure(udp_bind_internal, (VALUE)&arg, rsock_freeaddrinfo, (VALUE)arg.res);
     if (!result) {
         rsock_sys_fail_host_port("bind(2)", host, port);
     }

From b4eb7e2281d2abf3c33a4e9bc8a096be287970c1 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 10 Oct 2024 15:11:47 +0900
Subject: [PATCH 005/140] Refine assertion failure message

---
 vm_method.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vm_method.c b/vm_method.c
index e436538f566b57..fb6fe3b5933bfa 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -759,9 +759,11 @@ static rb_method_entry_t *
 rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, rb_method_definition_t *def, bool complement)
 {
     if (def) method_definition_addref(def, complement);
-    VM_ASSERT(!defined_class ||
-              NIL_P(defined_class) || // negative cache
-              RB_TYPE_P(defined_class, T_CLASS) || RB_TYPE_P(defined_class, T_ICLASS));
+    if (RTEST(defined_class)) {
+        // not negative cache
+        VM_ASSERT(RB_TYPE_P(defined_class, T_CLASS) || RB_TYPE_P(defined_class, T_ICLASS),
+                  "defined_class: %s", rb_obj_info(defined_class));
+    }
     rb_method_entry_t *me = IMEMO_NEW(rb_method_entry_t, imemo_ment, defined_class);
     *((rb_method_definition_t **)&me->def) = def;
     me->called_id = called_id;
@@ -1083,8 +1085,6 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
     return me;
 }
 
-static rb_method_entry_t *rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, rb_method_definition_t *def, bool refined);
-
 static st_table *
 overloaded_cme_table(void)
 {

From 01abc2f79e770df5e6cc75a4610f4831ff0b5bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 10 Oct 2024 22:00:05 +0200
Subject: [PATCH 006/140] [rubygems/rubygems] Check that the binstub was
 actually reset

https://github.com/rubygems/rubygems/commit/d46fca6126
---
 test/rubygems/test_gem_commands_pristine_command.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
index 2a715921b33d32..46c06db014db47 100644
--- a/test/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -655,6 +655,8 @@ def test_execute_default_gem
       @ui.output.split("\n")
     )
     assert_empty(@ui.error)
+
+    refute_includes "ruby_executable_hooks", File.read(exe)
   end
 
   def test_execute_multi_platform

From aad4bfd7bc1170394fcedf1997d644f8374ad7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Wed, 9 Oct 2024 09:13:49 +0200
Subject: [PATCH 007/140] [rubygems/rubygems] Fix `gem install` on NFS shares

NFS shares seem to support flock these days, but they need read-write
permissions.

https://github.com/rubygems/rubygems/commit/1c492804cd
---
 lib/bundler/rubygems_ext.rb | 5 ++---
 lib/rubygems.rb             | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index 14f10af9d75d71..547102be41c22b 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -36,15 +36,14 @@ class << self
       remove_method :open_file_with_flock if Gem.respond_to?(:open_file_with_flock)
 
       def open_file_with_flock(path, &block)
-        mode = IO::RDONLY | IO::APPEND | IO::CREAT | IO::BINARY
+        # read-write mode is used rather than read-only in order to support NFS
+        mode = IO::RDWR | IO::APPEND | IO::CREAT | IO::BINARY
         mode |= IO::SHARE_DELETE if IO.const_defined?(:SHARE_DELETE)
 
         File.open(path, mode) do |io|
           begin
             io.flock(File::LOCK_EX)
           rescue Errno::ENOSYS, Errno::ENOTSUP
-          rescue Errno::ENOLCK # NFS
-            raise unless Thread.main == Thread.current
           end
           yield io
         end
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 43c0d8f13c6b4d..8c3e8bdc68bd32 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -808,15 +808,14 @@ def self.open_file_with_lock(path, &block)
   # Open a file with given flags, and protect access with flock
 
   def self.open_file_with_flock(path, &block)
-    mode = IO::RDONLY | IO::APPEND | IO::CREAT | IO::BINARY
+    # read-write mode is used rather than read-only in order to support NFS
+    mode = IO::RDWR | IO::APPEND | IO::CREAT | IO::BINARY
     mode |= IO::SHARE_DELETE if IO.const_defined?(:SHARE_DELETE)
 
     File.open(path, mode) do |io|
       begin
         io.flock(File::LOCK_EX)
       rescue Errno::ENOSYS, Errno::ENOTSUP
-      rescue Errno::ENOLCK # NFS
-        raise unless Thread.main == Thread.current
       end
       yield io
     end

From 047a7750d1064c9d13811f3498325f4d2101b681 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 11 Oct 2024 18:55:57 +0900
Subject: [PATCH 008/140] [ruby/time] [DOC] Escape the word "Date" that does
 not mean Date class

https://github.com/ruby/time/commit/933eccf8d9
---
 lib/time.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/time.rb b/lib/time.rb
index 7cb3a0948282b8..c06e97e74fb1f8 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -407,7 +407,7 @@ def parse(date, now=self.now)
     # %c :: The preferred local date and time representation
     # %C :: Century (20 in 2009)
     # %d :: Day of the month (01..31)
-    # %D :: Date (%m/%d/%y)
+    # %D :: \Date (%m/%d/%y)
     # %e :: Day of the month, blank-padded ( 1..31)
     # %F :: Equivalent to %Y-%m-%d (the ISO 8601 date format)
     # %g :: The last two digits of the commercial year

From d641b7d172a715b4407218de250d93e6a2f5e158 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 10 Oct 2024 11:09:53 -0400
Subject: [PATCH 009/140] Improve RUBY_GC_LIBRARY

Instead of passing the full GC SO file name to RUBY_GC_LIBRARY, we now
only need to pass the GC name.

For example, before we needed to pass `RUBY_GC_LIBRARY=librubygc.default.so`
but now we only need to pass `RUBY_GC_LIBRARY=default`.
---
 .github/workflows/ubuntu.yml |  2 +-
 configure.ac                 |  2 ++
 gc.c                         | 22 ++++++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 750944e754ed30..7587762d8cc52a 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: Build shared GC
         run: |
-          echo "RUBY_GC_LIBRARY=librubygc.default.so" >> $GITHUB_ENV
+          echo "RUBY_GC_LIBRARY=default" >> $GITHUB_ENV
           make shared-gc SHARED_GC=default
         if: ${{ matrix.shared_gc }}
 
diff --git a/configure.ac b/configure.ac
index ca578f8e9f4246..21fa34e307bef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3403,6 +3403,8 @@ AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
 test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
 AC_SUBST(DLEXT)
 
+AC_DEFINE_UNQUOTED(SOEXT, ".$SOEXT")
+
 : "strip" && {
     AC_MSG_CHECKING([for $STRIP flags])
     AC_LINK_IFELSE([AC_LANG_PROGRAM], [AS_IF(
diff --git a/gc.c b/gc.c
index 7b6decf3d2a6c5..c2889a78c25f8f 100644
--- a/gc.c
+++ b/gc.c
@@ -659,7 +659,7 @@ ruby_external_gc_init(void)
     char *gc_so_path = NULL;
     void *handle = NULL;
     if (gc_so_file) {
-        /* Check to make sure that gc_so_file matches /[\w-_.]+/ so that it does
+        /* Check to make sure that gc_so_file matches /[\w-_]+/ so that it does
          * not load a shared object outside of the directory. */
         for (size_t i = 0; i < strlen(gc_so_file); i++) {
             char c = gc_so_file[i];
@@ -667,17 +667,27 @@ ruby_external_gc_init(void)
             switch (c) {
               case '-':
               case '_':
-              case '.':
                 break;
               default:
-                fprintf(stderr, "Only alphanumeric, dash, underscore, and period is allowed in "RUBY_GC_LIBRARY"\n");
+                fprintf(stderr, "Only alphanumeric, dash, and underscore is allowed in "RUBY_GC_LIBRARY"\n");
                 exit(1);
             }
         }
 
-        gc_so_path = alloca(strlen(SHARED_GC_DIR) + strlen(gc_so_file) + 1);
-        strcpy(gc_so_path, SHARED_GC_DIR);
-        strcpy(gc_so_path + strlen(SHARED_GC_DIR), gc_so_file);
+        size_t gc_so_path_size = strlen(SHARED_GC_DIR "librubygc." SOEXT) + strlen(gc_so_file) + 1;
+        gc_so_path = alloca(gc_so_path_size);
+        {
+            size_t gc_so_path_idx = 0;
+#define GC_SO_PATH_APPEND(str) do { \
+    gc_so_path_idx += strlcpy(gc_so_path + gc_so_path_idx, str, gc_so_path_size - gc_so_path_idx); \
+} while (0)
+            GC_SO_PATH_APPEND(SHARED_GC_DIR);
+            GC_SO_PATH_APPEND("librubygc.");
+            GC_SO_PATH_APPEND(gc_so_file);
+            GC_SO_PATH_APPEND(SOEXT);
+            GC_ASSERT(gc_so_path_idx == gc_so_path_size - 1);
+#undef GC_SO_PATH_APPEND
+        }
 
         handle = dlopen(gc_so_path, RTLD_LAZY | RTLD_GLOBAL);
         if (!handle) {

From df2fb8802800ada0cf709cdd0ad9abe0a6b238a3 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 10 Oct 2024 15:24:17 -0400
Subject: [PATCH 010/140] Remove unused SOEXT macro in ruby-runner.h

---
 template/ruby-runner.h.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/ruby-runner.h.in b/template/ruby-runner.h.in
index fdfe88dcb9e225..83fb0b4e87e55f 100644
--- a/template/ruby-runner.h.in
+++ b/template/ruby-runner.h.in
@@ -6,4 +6,3 @@
 #define PATH_SEP   '@PATH_SEPARATOR@'
 #define EXTOUT     "@EXTOUT@"
 #define ARCH       "@arch@"
-#define SOEXT      "@SOEXT@"

From 372bb990ac5ea8e348b9187b53d108d06049e6a3 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 10 Oct 2024 15:25:59 -0400
Subject: [PATCH 011/140] Remove unused PRELOADENV macro in ruby-runner.h

---
 template/ruby-runner.h.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/template/ruby-runner.h.in b/template/ruby-runner.h.in
index 83fb0b4e87e55f..b94086c5652c7a 100644
--- a/template/ruby-runner.h.in
+++ b/template/ruby-runner.h.in
@@ -1,7 +1,6 @@
 #define ABS_SRCDIR "@abs_srcdir@"
 #define BUILDDIR   "@abs_top_builddir@"
 #define LIBPATHENV "@LIBPATHENV@"
-#define PRELOADENV "@PRELOADENV@"
 #define PATH_SEPARATOR "@PATH_SEPARATOR@"
 #define PATH_SEP   '@PATH_SEPARATOR@'
 #define EXTOUT     "@EXTOUT@"

From 11e7ab79deb5935573d15ba4f33fc41e5c2b7522 Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@users.noreply.github.com>
Date: Fri, 11 Oct 2024 10:22:44 -0400
Subject: [PATCH 012/140] Remove 1 allocation in Enumerable#each_with_index
 (#11868)

* Remove 1 allocation in Enumerable#each_with_index

Previously, each call to Enumerable#each_with_index allocates 2
objects, one for the counting index, the other an imemo_ifunc passed
to `self.each` as a block.

Use `struct vm_ifunc::data` to hold the counting index directly to
remove 1 allocation.

* [DOC] Brief summary for usages of `struct vm_ifunc`
---
 enum.c           | 14 +++++---------
 internal/imemo.h |  7 ++++++-
 internal/vm.h    |  1 +
 vm_eval.c        | 11 +++++++++++
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/enum.c b/enum.c
index 6aec34d8500c35..d8a7cb73f3f707 100644
--- a/enum.c
+++ b/enum.c
@@ -2984,13 +2984,12 @@ enum_member(VALUE obj, VALUE val)
 }
 
 static VALUE
-each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
+each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(_, index))
 {
-    struct MEMO *m = MEMO_CAST(memo);
-    VALUE n = imemo_count_value(m);
+    struct vm_ifunc *ifunc = rb_current_ifunc();
+    ifunc->data = (const void *)rb_int_succ(index);
 
-    imemo_count_up(m);
-    return rb_yield_values(2, rb_enum_values_pack(argc, argv), n);
+    return rb_yield_values(2, rb_enum_values_pack(argc, argv), index);
 }
 
 /*
@@ -3024,12 +3023,9 @@ each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 static VALUE
 enum_each_with_index(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
-
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    memo = MEMO_NEW(0, 0, 0);
-    rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)memo);
+    rb_block_call(obj, id_each, argc, argv, each_with_index_i, INT2FIX(0));
     return obj;
 }
 
diff --git a/internal/imemo.h b/internal/imemo.h
index 7420909a140546..cb0a52851849a3 100644
--- a/internal/imemo.h
+++ b/internal/imemo.h
@@ -79,7 +79,12 @@ struct vm_ifunc_argc {
 #endif
 };
 
-/*! IFUNC (Internal FUNCtion) */
+/*! IFUNC (Internal FUNCtion)
+ *
+ * Bookkeeping for converting a C function and some closed-over data into a
+ * block passable to methods. Like Ruby Proc, but not directly accessible at
+ * Ruby level since this is an imemo. See rb_block_call() and friends.
+ */
 struct vm_ifunc {
     VALUE flags;
     VALUE *svar_lep;
diff --git a/internal/vm.h b/internal/vm.h
index 0b6b92c2799b09..c30e26a8b4a7d8 100644
--- a/internal/vm.h
+++ b/internal/vm.h
@@ -77,6 +77,7 @@ VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv,
 void rb_check_stack_overflow(void);
 #define RB_BLOCK_NO_USE_PACKED_ARGS 2
 VALUE rb_block_call2(VALUE obj, ID mid, int argc, const VALUE *argv, rb_block_call_func_t bl_proc, VALUE data2, long flags);
+struct vm_ifunc *rb_current_ifunc(void);
 
 #if USE_YJIT
 /* vm_exec.c */
diff --git a/vm_eval.c b/vm_eval.c
index ff8e2e6780ffd7..469b89c03ac7e5 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -2702,6 +2702,17 @@ rb_current_realfilepath(void)
     return Qnil;
 }
 
+// Assert that an internal function is running and return
+// the imemo object that represents it.
+struct vm_ifunc *
+rb_current_ifunc(void)
+{
+    // Search VM_FRAME_MAGIC_IFUNC to see ifunc imemos put on the iseq field.
+    VALUE ifunc = (VALUE)GET_EC()->cfp->iseq;
+    RUBY_ASSERT_ALWAYS(imemo_type_p(ifunc, imemo_ifunc));
+    return (struct vm_ifunc *)ifunc;
+}
+
 void
 Init_vm_eval(void)
 {

From a9fb0a20832f71d3240d43cf22e4655bd3a8c2ab Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@users.noreply.github.com>
Date: Fri, 11 Oct 2024 10:24:47 -0400
Subject: [PATCH 013/140] YJIT: Improve build instructions for non-hackers
 (#11878)

---
 doc/yjit/yjit.md | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/yjit/yjit.md b/doc/yjit/yjit.md
index 906a827d51d1ba..d57d5dceda43e5 100644
--- a/doc/yjit/yjit.md
+++ b/doc/yjit/yjit.md
@@ -64,12 +64,19 @@ You can change how much executable memory is allocated using [YJIT's command-lin
 ### Requirements
 
 You will need to install:
-- A C compiler such as GCC or Clang
-- GNU Make and Autoconf
-- The Rust compiler `rustc` and Cargo (if you want to build in dev/debug mode)
-  - The Rust version must be [>= 1.58.0](../../yjit/Cargo.toml).
 
-To install the Rust build toolchain, we suggest following the [recommended installation method][rust-install]. Rust also provides first class [support][editor-tools] for many source code editors.
+ - All the usual build tools for Ruby. See [Building Ruby](../contributing/building_ruby.md)
+ - The Rust compiler `rustc`
+    - The Rust version must be [>= 1.58.0](../../yjit/Cargo.toml).
+ - Optionally, only if you wish to build in dev/debug mode, Rust's `cargo`
+
+If you don't intend on making code changes to YJIT itself, we recommend
+obtaining `rustc` through your OS's package manager since that
+likely reuses the same vendor which provides the C toolchain.
+
+If you will be changing YJIT's Rust code, we suggest using the
+[first-party installation method][rust-install] for Rust. Rust also provides
+first class [support][editor-tools] for many source code editors.
 
 [rust-install]: https://www.rust-lang.org/tools/install
 [editor-tools]: https://www.rust-lang.org/tools

From c51947671ee338a66f299f17f7713c654cf47745 Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Fri, 11 Oct 2024 10:12:12 -0500
Subject: [PATCH 014/140] [DOC] Tweaks for Array#repeated_permutation (#11873)

---
 array.c | 71 ++++++++++++++++++---------------------------------------
 1 file changed, 22 insertions(+), 49 deletions(-)

diff --git a/array.c b/array.c
index 2a2893cffeec35..643a6352538fbd 100644
--- a/array.c
+++ b/array.c
@@ -7213,68 +7213,41 @@ rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *    array.repeated_permutation(n) {|permutation| ... } -> self
- *    array.repeated_permutation(n) -> new_enumerator
+ *    repeated_permutation(size) {|permutation| ... } -> self
+ *    repeated_permutation(size) -> new_enumerator
  *
- *  Calls the block with each repeated permutation of length +n+ of the elements of +self+;
- *  each permutation is an +Array+;
+ *  With a block given, calls the block with each repeated permutation of length +size+
+ *  of the elements of +self+;
+ *  each permutation is an array;
  *  returns +self+. The order of the permutations is indeterminate.
  *
- *  When a block and a positive Integer argument +n+ are given, calls the block with each
- *  +n+-tuple repeated permutation of the elements of +self+.
- *  The number of permutations is <tt>self.size**n</tt>.
- *
- *  +n+ = 1:
- *
- *    a = [0, 1, 2]
- *    a.repeated_permutation(1) {|permutation| p permutation }
- *
- *  Output:
- *
- *    [0]
- *    [1]
- *    [2]
- *
- *  +n+ = 2:
- *
- *    a.repeated_permutation(2) {|permutation| p permutation }
+ *  If a positive integer argument +size+ is given,
+ *  calls the block with each +size+-tuple repeated permutation of the elements of +self+.
+ *  The number of permutations is <tt>self.size**size</tt>.
  *
- *  Output:
+ *  Examples:
  *
- *    [0, 0]
- *    [0, 1]
- *    [0, 2]
- *    [1, 0]
- *    [1, 1]
- *    [1, 2]
- *    [2, 0]
- *    [2, 1]
- *    [2, 2]
+ *  - +size+ is 1:
  *
- *  If +n+ is zero, calls the block once with an empty +Array+.
+ *      p = []
+ *      [0, 1, 2].repeated_permutation(1) {|permutation| p.push(permutation) }
+ *      p # => [[0], [1], [2]]
  *
- *  If +n+ is negative, does not call the block:
+ *  - +size+ is 2:
  *
- *    a.repeated_permutation(-1) {|permutation| fail 'Cannot happen' }
+ *      p = []
+ *      [0, 1, 2].repeated_permutation(2) {|permutation| p.push(permutation) }
+ *      p # => [[0, 0], [0, 1], [0, 2], [1, 0], [1, 1], [1, 2], [2, 0], [2, 1], [2, 2]]
  *
- *  Returns a new Enumerator if no block given:
+ *  If +size+ is zero, calls the block once with an empty array.
  *
- *    a = [0, 1, 2]
- *    a.repeated_permutation(2) # => #<Enumerator: [0, 1, 2]:permutation(2)>
+ *  If +size+ is negative, does not call the block:
  *
- *  Using Enumerators, it's convenient to show the permutations and counts
- *  for some values of +n+:
+ *    [0, 1, 2].repeated_permutation(-1) {|permutation| fail 'Cannot happen' }
  *
- *    e = a.repeated_permutation(0)
- *    e.size # => 1
- *    e.to_a # => [[]]
- *    e = a.repeated_permutation(1)
- *    e.size # => 3
- *    e.to_a # => [[0], [1], [2]]
- *    e = a.repeated_permutation(2)
- *    e.size # => 9
- *    e.to_a # => [[0, 0], [0, 1], [0, 2], [1, 0], [1, 1], [1, 2], [2, 0], [2, 1], [2, 2]]
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Combining}[rdoc-ref:Array@Methods+for+Combining].
  */
 static VALUE
 rb_ary_repeated_permutation(VALUE ary, VALUE num)

From c044777562c72dd66d906a774d944208576e5ea2 Mon Sep 17 00:00:00 2001
From: BurdetteLamar <burdettelamar@yahoo.com>
Date: Thu, 10 Oct 2024 15:43:41 -0500
Subject: [PATCH 015/140] [DOC] Tweaks for Array#rotate

---
 array.c | 44 ++++++++++++++------------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/array.c b/array.c
index 643a6352538fbd..275ac006c25c63 100644
--- a/array.c
+++ b/array.c
@@ -3240,51 +3240,35 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *    array.rotate -> new_array
- *    array.rotate(count) -> new_array
+ *    rotate(count = 1) -> new_array
  *
- *  Returns a new +Array+ formed from +self+ with elements
+ *  Returns a new array formed from +self+ with elements
  *  rotated from one end to the other.
  *
- *  When no argument given, returns a new +Array+ that is like +self+,
- *  except that the first element has been rotated to the last position:
+ *  With non-negative numeric +count+,
+ *  rotates elements from the beginning to the end:
  *
- *    a = [:foo, 'bar', 2, 'bar']
- *    a1 = a.rotate
- *    a1 # => ["bar", 2, "bar", :foo]
- *
- *  When given a non-negative Integer +count+,
- *  returns a new +Array+ with +count+ elements rotated from the beginning to the end:
- *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(2)
- *    a1 # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate(2)   # => [2, 3, 0, 1]
+ *    [0, 1, 2, 3].rotate(2.1) # => [2, 3, 0, 1]
  *
  *  If +count+ is large, uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(20)
- *    a1 # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate(22) # => [2, 3, 0, 1]
  *
- *  If +count+ is zero, returns a copy of +self+, unmodified:
+ *  With a +count+ of zero, rotates no elements:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(0)
- *    a1 # => [:foo, "bar", 2]
+ *    [0, 1, 2, 3].rotate(0) # => [0, 1, 2, 3]
  *
- *  When given a negative Integer +count+, rotates in the opposite direction,
- *  from end to beginning:
+ *  With negative numeric +count+, rotates in the opposite direction,
+ *  from the end to the beginning:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(-2)
- *    a1 # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate(-1) # => [3, 0, 1, 2]
  *
  *  If +count+ is small (far from zero), uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a1 = a.rotate(-5)
- *    a1 # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate(-21) # => [3, 0, 1, 2]
  *
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 static VALUE

From 5e799cc182fdab41b696b0dea036751d621ca4f5 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Sat, 12 Oct 2024 01:16:05 +1000
Subject: [PATCH 016/140] Fix spelling

---
 .github/actions/launchable/setup/action.yml | 2 +-
 doc/date/calendars.rdoc                     | 2 +-
 yjit/src/core.rs                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/actions/launchable/setup/action.yml b/.github/actions/launchable/setup/action.yml
index 4b469ccd64fcc4..2d92cb7d9967c1 100644
--- a/.github/actions/launchable/setup/action.yml
+++ b/.github/actions/launchable/setup/action.yml
@@ -35,7 +35,7 @@ inputs:
     required: false
     default: ${{ github.workspace }}
     description: >-
-      Directory to (re-)checkout source codes. Launchable retrives the commit information
+      Directory to (re-)checkout source codes. Launchable retrieves the commit information
       from the directory.
 
   launchable-workspace:
diff --git a/doc/date/calendars.rdoc b/doc/date/calendars.rdoc
index b8690841b1d45c..2f5fe038c7c926 100644
--- a/doc/date/calendars.rdoc
+++ b/doc/date/calendars.rdoc
@@ -18,7 +18,7 @@ The reasons for the difference are religious/political histories.
 - On October 15, 1582, several countries changed
   from the Julian calendar to the Gregorian calendar;
   these included Italy, Poland, Portugal, and Spain.
-  Other contries in the Western world retained the Julian calendar.
+  Other countries in the Western world retained the Julian calendar.
 - On September 14, 1752, most of the British empire
   changed from the Julian calendar to the Gregorian calendar.
 
diff --git a/yjit/src/core.rs b/yjit/src/core.rs
index 732c5cbe2f1fc2..32bce76a015219 100644
--- a/yjit/src/core.rs
+++ b/yjit/src/core.rs
@@ -4014,7 +4014,7 @@ unsafe fn remove_from_graph(blockref: BlockRef) {
 
 /// Tear down a block and deallocate it.
 /// Caller has to ensure that the code tracked by the block is not
-/// running, as running code may hit [branch_stub_hit] who exepcts
+/// running, as running code may hit [branch_stub_hit] who expects
 /// [Branch] to be live.
 ///
 /// We currently ensure this through the `jit_cont` system in cont.c

From 628da153bb184285aee864b4548f974e547d839d Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Fri, 11 Oct 2024 10:25:58 -0500
Subject: [PATCH 017/140] [DOC] Tweaks for Array#sample (#11876)

---
 array.rb | 51 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/array.rb b/array.rb
index 866d8877c7ca9c..3d64d31e95ee3e 100644
--- a/array.rb
+++ b/array.rb
@@ -73,35 +73,52 @@ def shuffle(random: Random)
   end
 
   # call-seq:
-  #    array.sample(random: Random) -> object
-  #    array.sample(n, random: Random) -> new_ary
+  #   sample(random: Random) -> object
+  #   sample(count, random: Random) -> new_ary
   #
-  # Returns random elements from +self+.
+  # Returns random elements from +self+,
+  # as selected by the object given by keyword argument +random+.
   #
-  # When no arguments are given, returns a random element from +self+:
-  #    a = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  # With no argument +count+ given, returns one random element from +self+:
+  #
+  #    a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
   #    a.sample # => 3
   #    a.sample # => 8
-  # If +self+ is empty, returns +nil+.
   #
-  # When argument +n+ is given, returns a new +Array+ containing +n+ random
-  # elements from +self+:
+  # Returns +nil+ if +self+ is empty:
+  #
+  #    [].sample # => nil
+  #
+  #
+  # With non-negative numeric argument +count+ given,
+  # returns a new array containing +count+ random elements from +self+:
+  #
   #    a.sample(3) # => [8, 9, 2]
-  #    a.sample(6) # => [9, 6, 10, 3, 1, 4]
+  #    a.sample(6) # => [9, 6, 0, 3, 1, 4]
+  #
+  # The order of the result array is unrelated to the order of +self+.
+  #
+  # Returns a new empty +Array+ if +self+ is empty:
+  #
+  #   [].sample(4) # => []
+  #
+  # May return duplicates in +self+:
+  #
+  #    a = [1, 1, 1, 2, 2, 3]
+  #    a.sample(a.size) # => [1, 1, 3, 2, 1, 2]
+  #
   # Returns no more than <tt>a.size</tt> elements
   # (because no new duplicates are introduced):
-  #    a.sample(a.size * 2) # => [6, 4, 1, 8, 5, 9, 10, 2, 3, 7]
-  # But +self+ may contain duplicates:
-  #    a = [1, 1, 1, 2, 2, 3]
-  #    a.sample(a.size * 2) # => [1, 1, 3, 2, 1, 2]
-  # The argument +n+ must be a non-negative numeric value.
-  # The order of the result array is unrelated to the order of +self+.
-  # Returns a new empty +Array+ if +self+ is empty.
   #
-  # The optional +random+ argument will be used as the random number generator:
+  #    a.sample(50) # => [6, 4, 1, 8, 5, 9, 0, 2, 3, 7]
+  #
+  # The object given with keyword argument +random+ is used as the random number generator:
+  #
   #    a = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
   #    a.sample(random: Random.new(1))     #=> 6
   #    a.sample(4, random: Random.new(1))  #=> [6, 10, 9, 2]
+  #
+  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
   def sample(n = (ary = false), random: Random)
     if Primitive.mandatory_only?
       # Primitive.cexpr! %{ rb_ary_sample(self, rb_cRandom, Qfalse, Qfalse) }

From 77c7d88015aa7454f2c34d54ec313dc4dc464ae0 Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Fri, 11 Oct 2024 10:30:52 -0500
Subject: [PATCH 018/140] [DOC] Tweaks for Array#rotate! (#11875)

---
 array.c | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/array.c b/array.c
index 275ac006c25c63..b6768e52d3b4c7 100644
--- a/array.c
+++ b/array.c
@@ -3186,48 +3186,34 @@ rb_ary_rotate(VALUE ary, long cnt)
 
 /*
  *  call-seq:
- *    array.rotate! -> self
- *    array.rotate!(count) -> self
+ *    rotate!(count = 1) -> self
  *
  *  Rotates +self+ in place by moving elements from one end to the other; returns +self+.
  *
- *  When no argument given, rotates the first element to the last position:
- *
- *    a = [:foo, 'bar', 2, 'bar']
- *    a.rotate! # => ["bar", 2, "bar", :foo]
- *
- *  When given a non-negative Integer +count+,
+ *  With non-negative numeric +count+,
  *  rotates +count+ elements from the beginning to the end:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(2)
- *    a # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate!(2)   # => [2, 3, 0, 1]
+      [0, 1, 2, 3].rotate!(2.1) # => [2, 3, 0, 1]
  *
  *  If +count+ is large, uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(20)
- *    a # => [2, :foo, "bar"]
+ *    [0, 1, 2, 3].rotate!(21) # => [1, 2, 3, 0]
  *
- *  If +count+ is zero, returns +self+ unmodified:
+ *  If +count+ is zero, rotates no elements:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(0)
- *    a # => [:foo, "bar", 2]
+ *    [0, 1, 2, 3].rotate!(0) # => [0, 1, 2, 3]
  *
- *  When given a negative Integer +count+, rotates in the opposite direction,
+ *  With a negative numeric +count+, rotates in the opposite direction,
  *  from end to beginning:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(-2)
- *    a # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate!(-1) # => [3, 0, 1, 2]
  *
  *  If +count+ is small (far from zero), uses <tt>count % array.size</tt> as the count:
  *
- *    a = [:foo, 'bar', 2]
- *    a.rotate!(-5)
- *    a # => ["bar", 2, :foo]
+ *    [0, 1, 2, 3].rotate!(-21) # => [3, 0, 1, 2]
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE

From 2dab59933c469e50e66ac2adc2d9bb73554e2e21 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 10 Oct 2024 11:52:33 -0400
Subject: [PATCH 019/140] Remove defined check for GC.config in test_gc.rb

GC.config is always defined.
---
 test/ruby/test_gc.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index faa0b1f89365a8..7c49f0f5bb9a4c 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -53,22 +53,16 @@ def test_enable_disable
   end
 
   def test_gc_config_full_mark_by_default
-    omit "unsupported platform/GC" unless defined?(GC.config)
-
     config = GC.config
     assert_not_empty(config)
     assert_true(config[:rgengc_allow_full_mark])
   end
 
   def test_gc_config_invalid_args
-    omit "unsupported platform/GC" unless defined?(GC.config)
-
     assert_raise(ArgumentError) { GC.config(0) }
   end
 
   def test_gc_config_setting_returns_updated_config_hash
-    omit "unsupported platform/GC" unless defined?(GC.config)
-
     old_value = GC.config[:rgengc_allow_full_mark]
     assert_true(old_value)
 
@@ -82,8 +76,6 @@ def test_gc_config_setting_returns_updated_config_hash
   end
 
   def test_gc_config_setting_returns_nil_for_missing_keys
-    omit "unsupported platform/GC" unless defined?(GC.config)
-
     missing_value = GC.config(no_such_key: true)[:no_such_key]
     assert_nil(missing_value)
   ensure
@@ -92,8 +84,6 @@ def test_gc_config_setting_returns_nil_for_missing_keys
   end
 
   def test_gc_config_disable_major
-    omit "unsupported platform/GC" unless defined?(GC.config)
-
     GC.enable
     GC.start
 
@@ -116,8 +106,6 @@ def test_gc_config_disable_major
   end
 
   def test_gc_config_disable_major_gc_start_always_works
-    omit "unsupported platform/GC" unless defined?(GC.config)
-
     GC.config(full_mark: false)
 
     major_count = GC.stat[:major_gc_count]

From eccfb6e60c2dba67ce5b1315a07598c2ba8b1ffb Mon Sep 17 00:00:00 2001
From: Gert Goet <gert@thinkcreate.nl>
Date: Fri, 11 Oct 2024 18:34:15 +0200
Subject: [PATCH 020/140] [ruby/irb] History refactors
 (https://github.com/ruby/irb/pull/1013)

* Extract logic save_history in separate helper

* Extract logic history_file in helper

* Allow for readonly history

https://github.com/ruby/irb/commit/52307f9026
---
 lib/irb.rb               |   8 ++-
 lib/irb/history.rb       | 144 ++++++++++++++++++++++++---------------
 test/irb/test_history.rb |  17 ++++-
 3 files changed, 110 insertions(+), 59 deletions(-)

diff --git a/lib/irb.rb b/lib/irb.rb
index 213e231174423f..7e91b0f64507e1 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -14,6 +14,7 @@
 
 require_relative "irb/ruby-lex"
 require_relative "irb/statement"
+require_relative "irb/history"
 require_relative "irb/input-method"
 require_relative "irb/locale"
 require_relative "irb/color"
@@ -972,7 +973,7 @@ def debug_readline(binding)
       # debugger.
       input = nil
       forced_exit = catch(:IRB_EXIT) do
-        if IRB.conf[:SAVE_HISTORY] && context.io.support_history_saving?
+        if History.save_history? && context.io.support_history_saving?
           # Previous IRB session's history has been saved when `Irb#run` is exited We need
           # to make sure the saved history is not saved again by resetting the counter
           context.io.reset_history_counter
@@ -1003,9 +1004,10 @@ def run(conf = IRB.conf)
       prev_context = conf[:MAIN_CONTEXT]
       conf[:MAIN_CONTEXT] = context
 
-      save_history = !in_nested_session && conf[:SAVE_HISTORY] && context.io.support_history_saving?
+      load_history = !in_nested_session && context.io.support_history_saving?
+      save_history = load_history && History.save_history?
 
-      if save_history
+      if load_history
         context.io.load_history
       end
 
diff --git a/lib/irb/history.rb b/lib/irb/history.rb
index 685354b2d8400b..a428003d2de946 100644
--- a/lib/irb/history.rb
+++ b/lib/irb/history.rb
@@ -1,6 +1,42 @@
 require "pathname"
 
 module IRB
+  module History
+    class << self
+      # Integer representation of <code>IRB.conf[:HISTORY_FILE]</code>.
+      def save_history
+        num = IRB.conf[:SAVE_HISTORY].to_i
+        # Bignums cause RangeErrors when slicing arrays.
+        # Treat such values as 'infinite'.
+        (num > save_history_max) ? -1 : num
+      end
+
+      def save_history?
+        !save_history.zero?
+      end
+
+      def infinite?
+        save_history.negative?
+      end
+
+      # Might be nil when HOME and XDG_CONFIG_HOME are not available.
+      def history_file
+        if (history_file = IRB.conf[:HISTORY_FILE])
+          File.expand_path(history_file)
+        else
+          IRB.rc_file("_history")
+        end
+      end
+
+      private
+
+      def save_history_max
+        # Max fixnum (32-bit) that can be used without getting RangeError.
+        2**30 - 1
+      end
+    end
+  end
+
   module HistorySavingAbility # :nodoc:
     def support_history_saving?
       true
@@ -11,76 +47,74 @@ def reset_history_counter
     end
 
     def load_history
+      history_file = History.history_file
+      return unless File.exist?(history_file.to_s)
+
       history = self.class::HISTORY
 
-      if history_file = IRB.conf[:HISTORY_FILE]
-        history_file = File.expand_path(history_file)
-      end
-      history_file = IRB.rc_file("_history") unless history_file
-      if history_file && File.exist?(history_file)
-        File.open(history_file, "r:#{IRB.conf[:LC_MESSAGES].encoding}") do |f|
-          f.each { |l|
-            l = l.chomp
-            if self.class == RelineInputMethod and history.last&.end_with?("\\")
-              history.last.delete_suffix!("\\")
-              history.last << "\n" << l
-            else
-              history << l
-            end
-          }
-        end
-        @loaded_history_lines = history.size
-        @loaded_history_mtime = File.mtime(history_file)
+      File.open(history_file, "r:#{IRB.conf[:LC_MESSAGES].encoding}") do |f|
+        f.each { |l|
+          l = l.chomp
+          if self.class == RelineInputMethod and history.last&.end_with?("\\")
+            history.last.delete_suffix!("\\")
+            history.last << "\n" << l
+          else
+            history << l
+          end
+        }
       end
+      @loaded_history_lines = history.size
+      @loaded_history_mtime = File.mtime(history_file)
     end
 
     def save_history
+      return unless History.save_history?
+      return unless (history_file = History.history_file)
+      unless ensure_history_file_writable(history_file)
+        warn <<~WARN
+          Can't write history to #{History.history_file.inspect} due to insufficient permissions.
+          Please verify the value of `IRB.conf[:HISTORY_FILE]`. Ensure the folder exists and that both the folder and file (if it exists) are writable.
+        WARN
+        return
+      end
+
       history = self.class::HISTORY.to_a
 
-      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) != 0
-        if history_file = IRB.conf[:HISTORY_FILE]
-          history_file = File.expand_path(history_file)
-        end
-        history_file = IRB.rc_file("_history") unless history_file
+      if File.exist?(history_file) &&
+          File.mtime(history_file) != @loaded_history_mtime
+        history = history[@loaded_history_lines..-1] if @loaded_history_lines
+        append_history = true
+      end
 
-        # When HOME and XDG_CONFIG_HOME are not available, history_file might be nil
-        return unless history_file
+      File.open(history_file, (append_history ? "a" : "w"), 0o600, encoding: IRB.conf[:LC_MESSAGES]&.encoding) do |f|
+        hist = history.map { |l| l.scrub.split("\n").join("\\\n") }
 
-        # Change the permission of a file that already exists[BUG #7694]
-        begin
-          if File.stat(history_file).mode & 066 != 0
-            File.chmod(0600, history_file)
-          end
-        rescue Errno::ENOENT
-        rescue Errno::EPERM
-          return
-        rescue
-          raise
+        unless append_history || History.infinite?
+          hist = hist.last(History.save_history)
         end
 
-        if File.exist?(history_file) &&
-           File.mtime(history_file) != @loaded_history_mtime
-          history = history[@loaded_history_lines..-1] if @loaded_history_lines
-          append_history = true
-        end
+        f.puts(hist)
+      end
+    end
 
-        pathname = Pathname.new(history_file)
-        unless Dir.exist?(pathname.dirname)
-          warn "Warning: The directory to save IRB's history file does not exist. Please double check `IRB.conf[:HISTORY_FILE]`'s value."
-          return
-        end
+    private
 
-        File.open(history_file, (append_history ? 'a' : 'w'), 0o600, encoding: IRB.conf[:LC_MESSAGES]&.encoding) do |f|
-          hist = history.map{ |l| l.scrub.split("\n").join("\\\n") }
-          unless append_history
-            begin
-              hist = hist.last(num) if hist.size > num and num > 0
-            rescue RangeError # bignum too big to convert into `long'
-              # Do nothing because the bignum should be treated as infinity
-            end
-          end
-          f.puts(hist)
+    # Returns boolean whether writing to +history_file+ will be possible.
+    # Permissions of already existing +history_file+ are changed to
+    # owner-only-readable if necessary [BUG #7694].
+    def ensure_history_file_writable(history_file)
+      history_file = Pathname.new(history_file)
+
+      return false unless history_file.dirname.writable?
+      return true unless history_file.exist?
+
+      begin
+        if history_file.stat.mode & 0o66 != 0
+          history_file.chmod 0o600
         end
+        true
+      rescue Errno::EPERM # no permissions
+        false
       end
     end
   end
diff --git a/test/irb/test_history.rb b/test/irb/test_history.rb
index 7a17491d891711..791eef1acd0747 100644
--- a/test/irb/test_history.rb
+++ b/test/irb/test_history.rb
@@ -39,6 +39,21 @@ class TestInputMethodWithReadlineHistory < TestInputMethod
       include IRB::HistorySavingAbility
     end
 
+    def test_history_dont_save
+      omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
+      IRB.conf[:SAVE_HISTORY] = nil
+      assert_history(<<~EXPECTED_HISTORY, <<~INITIAL_HISTORY, <<~INPUT)
+        1
+        2
+      EXPECTED_HISTORY
+        1
+        2
+      INITIAL_HISTORY
+        3
+        exit
+      INPUT
+    end
+
     def test_history_save_1
       omit "Skip Editline" if /EditLine/n.match(Readline::VERSION)
       IRB.conf[:SAVE_HISTORY] = 1
@@ -166,7 +181,7 @@ def test_history_does_not_raise_when_history_file_directory_does_not_exist
       IRB.conf[:HISTORY_FILE] = "fake/fake/fake/history_file"
       io = TestInputMethodWithRelineHistory.new
 
-      assert_warn(/history file does not exist/) do
+      assert_warn(/ensure the folder exists/i) do
         io.save_history
       end
 

From 95abf679c546da0e9abf36bc9bdfc60a826b1811 Mon Sep 17 00:00:00 2001
From: Gert Goet <gert@thinkcreate.nl>
Date: Fri, 11 Oct 2024 18:34:56 +0200
Subject: [PATCH 021/140] [ruby/irb] Document infinite history
 (https://github.com/ruby/irb/pull/1012)

As introduced in 824473e8

https://github.com/ruby/irb/commit/15e3f50c3f
---
 lib/irb.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/irb.rb b/lib/irb.rb
index 7e91b0f64507e1..12eb69c5b187a7 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -221,11 +221,11 @@
 # *new_filepath*, which becomes the history file for the session.
 #
 # You can change the number of commands saved by adding to your configuration
-# file: `IRB.conf[:SAVE_HISTORY] = *n*`, wheHISTORY_FILEre *n* is one of:
+# file: `IRB.conf[:SAVE_HISTORY] = *n*`, where *n* is one of:
 #
-# *   Positive integer: the number of commands to be saved,
-# *   Zero: all commands are to be saved.
-# *   `nil`: no commands are to be saved,.
+# *   Positive integer: the number of commands to be saved.
+# *   Negative integer: all commands are to be saved.
+# *   Zero or `nil`: no commands are to be saved.
 #
 #
 # During the session, you can use methods `conf.save_history` or

From 6a88e9d43088f51d3d9dde9c89f24836ab715810 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Fri, 11 Oct 2024 14:01:08 -0400
Subject: [PATCH 022/140] Used respond_to? check for compaction in
 test_gc_compact.rb

---
 test/ruby/test_gc_compact.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/ruby/test_gc_compact.rb b/test/ruby/test_gc_compact.rb
index 26d7c71687fa96..15bf574f6b5129 100644
--- a/test/ruby/test_gc_compact.rb
+++ b/test/ruby/test_gc_compact.rb
@@ -9,7 +9,7 @@
 class TestGCCompact < Test::Unit::TestCase
   module CompactionSupportInspector
     def supports_auto_compact?
-      GC::OPTS.include?("GC_COMPACTION_SUPPORTED")
+      GC.respond_to?(:compact)
     end
   end
 

From 8aeb60aec88dd68fdfbaa75ca06e65188233ccbf Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Fri, 11 Oct 2024 14:08:59 -0400
Subject: [PATCH 023/140] Rename supports_auto_compact? to supports_compact?

It's testing whether GC compaction is supported in general.
---
 test/ruby/test_gc_compact.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/ruby/test_gc_compact.rb b/test/ruby/test_gc_compact.rb
index 15bf574f6b5129..4c8aa20215fb90 100644
--- a/test/ruby/test_gc_compact.rb
+++ b/test/ruby/test_gc_compact.rb
@@ -8,7 +8,7 @@
 
 class TestGCCompact < Test::Unit::TestCase
   module CompactionSupportInspector
-    def supports_auto_compact?
+    def supports_compact?
       GC.respond_to?(:compact)
     end
   end
@@ -17,7 +17,7 @@ module OmitUnlessCompactSupported
     include CompactionSupportInspector
 
     def setup
-      omit "autocompact not supported on this platform" unless supports_auto_compact?
+      omit "GC compaction not supported on this platform" unless supports_compact?
       super
     end
   end
@@ -83,7 +83,7 @@ class CompactMethodsNotImplemented < Test::Unit::TestCase
     include CompactionSupportInspector
 
     def assert_not_implemented(method, *args)
-      omit "autocompact is supported on this platform" if supports_auto_compact?
+      omit "autocompact is supported on this platform" if supports_compact?
 
       assert_raise(NotImplementedError) { GC.send(method, *args) }
       refute(GC.respond_to?(method), "GC.#{method} should be defined as rb_f_notimplement")

From 5f62522d5b8bd162ddf657680b8532eadeaae21f Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Fri, 11 Oct 2024 14:43:23 -0400
Subject: [PATCH 024/140] [ruby/prism] Prism::StringQuery

Introduce StringQuery to provide methods to access some metadata
about the Ruby lexer.

https://github.com/ruby/prism/commit/d3f55b67b9
---
 lib/prism.rb                         |   9 +-
 lib/prism/ffi.rb                     |  39 +++++++
 lib/prism/prism.gemspec              |   3 +
 lib/prism/string_query.rb            |  30 +++++
 prism/extension.c                    |  67 +++++++++++
 prism/prism.c                        | 163 +++++++++++++++++++++++++++
 prism/prism.h                        |  47 ++++++++
 test/prism/ruby/string_query_test.rb |  60 ++++++++++
 8 files changed, 414 insertions(+), 4 deletions(-)
 create mode 100644 lib/prism/string_query.rb
 create mode 100644 test/prism/ruby/string_query_test.rb

diff --git a/lib/prism.rb b/lib/prism.rb
index 66a64e7fd0369e..50b14a54861919 100644
--- a/lib/prism.rb
+++ b/lib/prism.rb
@@ -25,6 +25,7 @@ module Prism
   autoload :Pattern, "prism/pattern"
   autoload :Reflection, "prism/reflection"
   autoload :Serialize, "prism/serialize"
+  autoload :StringQuery, "prism/string_query"
   autoload :Translation, "prism/translation"
   autoload :Visitor, "prism/visitor"
 
@@ -75,13 +76,13 @@ def self.load(source, serialized)
 # it's going to require the built library. Otherwise, it's going to require a
 # module that uses FFI to call into the library.
 if RUBY_ENGINE == "ruby" and !ENV["PRISM_FFI_BACKEND"]
-  require "prism/prism"
-
   # The C extension is the default backend on CRuby.
   Prism::BACKEND = :CEXT
-else
-  require_relative "prism/ffi"
 
+  require "prism/prism"
+else
   # The FFI backend is used on other Ruby implementations.
   Prism::BACKEND = :FFI
+
+  require_relative "prism/ffi"
 end
diff --git a/lib/prism/ffi.rb b/lib/prism/ffi.rb
index 0520f7cdd24810..5caae440f4c336 100644
--- a/lib/prism/ffi.rb
+++ b/lib/prism/ffi.rb
@@ -73,6 +73,7 @@ def self.load_exported_functions_from(header, *functions, callbacks)
 
     callback :pm_parse_stream_fgets_t, [:pointer, :int, :pointer], :pointer
     enum :pm_string_init_result_t, %i[PM_STRING_INIT_SUCCESS PM_STRING_INIT_ERROR_GENERIC PM_STRING_INIT_ERROR_DIRECTORY]
+    enum :pm_string_query_t, [:PM_STRING_QUERY_ERROR, -1, :PM_STRING_QUERY_FALSE, :PM_STRING_QUERY_TRUE]
 
     load_exported_functions_from(
       "prism.h",
@@ -83,6 +84,9 @@ def self.load_exported_functions_from(header, *functions, callbacks)
       "pm_serialize_lex",
       "pm_serialize_parse_lex",
       "pm_parse_success_p",
+      "pm_string_query_local",
+      "pm_string_query_constant",
+      "pm_string_query_method_name",
       [:pm_parse_stream_fgets_t]
     )
 
@@ -492,4 +496,39 @@ def dump_options(options)
       values.pack(template)
     end
   end
+
+  # Here we are going to patch StringQuery to put in the class-level methods so
+  # that it can maintain a consistent interface
+  class StringQuery
+    class << self
+      # Mirrors the C extension's StringQuery::local? method.
+      def local?(string)
+        query(LibRubyParser.pm_string_query_local(string, string.bytesize, string.encoding.name))
+      end
+
+      # Mirrors the C extension's StringQuery::constant? method.
+      def constant?(string)
+        query(LibRubyParser.pm_string_query_constant(string, string.bytesize, string.encoding.name))
+      end
+
+      # Mirrors the C extension's StringQuery::method_name? method.
+      def method_name?(string)
+        query(LibRubyParser.pm_string_query_method_name(string, string.bytesize, string.encoding.name))
+      end
+
+      private
+
+      # Parse the enum result and return an appropriate boolean.
+      def query(result)
+        case result
+        when :PM_STRING_QUERY_ERROR
+          raise ArgumentError, "Invalid or non ascii-compatible encoding"
+        when :PM_STRING_QUERY_FALSE
+          false
+        when :PM_STRING_QUERY_TRUE
+          true
+        end
+      end
+    end
+  end
 end
diff --git a/lib/prism/prism.gemspec b/lib/prism/prism.gemspec
index 37aa9795765aad..6123b71fc8ea8a 100644
--- a/lib/prism/prism.gemspec
+++ b/lib/prism/prism.gemspec
@@ -89,6 +89,7 @@ Gem::Specification.new do |spec|
     "lib/prism/polyfill/unpack1.rb",
     "lib/prism/reflection.rb",
     "lib/prism/serialize.rb",
+    "lib/prism/string_query.rb",
     "lib/prism/translation.rb",
     "lib/prism/translation/parser.rb",
     "lib/prism/translation/parser33.rb",
@@ -109,6 +110,7 @@ Gem::Specification.new do |spec|
     "rbi/prism/node.rbi",
     "rbi/prism/parse_result.rbi",
     "rbi/prism/reflection.rbi",
+    "rbi/prism/string_query.rbi",
     "rbi/prism/translation/parser.rbi",
     "rbi/prism/translation/parser33.rbi",
     "rbi/prism/translation/parser34.rbi",
@@ -129,6 +131,7 @@ Gem::Specification.new do |spec|
     "sig/prism/pattern.rbs",
     "sig/prism/reflection.rbs",
     "sig/prism/serialize.rbs",
+    "sig/prism/string_query.rbs",
     "sig/prism/visitor.rbs",
     "src/diagnostic.c",
     "src/encoding.c",
diff --git a/lib/prism/string_query.rb b/lib/prism/string_query.rb
new file mode 100644
index 00000000000000..9011051d2b1fa4
--- /dev/null
+++ b/lib/prism/string_query.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Prism
+  # Query methods that allow categorizing strings based on their context for
+  # where they could be valid in a Ruby syntax tree.
+  class StringQuery
+    # The string that this query is wrapping.
+    attr_reader :string
+
+    # Initialize a new query with the given string.
+    def initialize(string)
+      @string = string
+    end
+
+    # Whether or not this string is a valid local variable name.
+    def local?
+      StringQuery.local?(string)
+    end
+
+    # Whether or not this string is a valid constant name.
+    def constant?
+      StringQuery.constant?(string)
+    end
+
+    # Whether or not this string is a valid method name.
+    def method_name?
+      StringQuery.method_name?(string)
+    end
+  end
+end
diff --git a/prism/extension.c b/prism/extension.c
index 93fa7b09897747..47603fd9b4f506 100644
--- a/prism/extension.c
+++ b/prism/extension.c
@@ -23,6 +23,7 @@ VALUE rb_cPrismResult;
 VALUE rb_cPrismParseResult;
 VALUE rb_cPrismLexResult;
 VALUE rb_cPrismParseLexResult;
+VALUE rb_cPrismStringQuery;
 
 VALUE rb_cPrismDebugEncoding;
 
@@ -1133,6 +1134,67 @@ parse_file_failure_p(int argc, VALUE *argv, VALUE self) {
     return RTEST(parse_file_success_p(argc, argv, self)) ? Qfalse : Qtrue;
 }
 
+/******************************************************************************/
+/* String query methods                                                       */
+/******************************************************************************/
+
+/**
+ * Process the result of a call to a string query method and return an
+ * appropriate value.
+ */
+static VALUE
+string_query(pm_string_query_t result) {
+    switch (result) {
+        case PM_STRING_QUERY_ERROR:
+            rb_raise(rb_eArgError, "Invalid or non ascii-compatible encoding");
+            return Qfalse;
+        case PM_STRING_QUERY_FALSE:
+            return Qfalse;
+        case PM_STRING_QUERY_TRUE:
+            return Qtrue;
+    }
+}
+
+/**
+ * call-seq:
+ *   Prism::StringQuery::local?(string) -> bool
+ *
+ * Returns true if the string constitutes a valid local variable name. Note that
+ * this means the names that can be set through Binding#local_variable_set, not
+ * necessarily the ones that can be set through a local variable assignment.
+ */
+static VALUE
+string_query_local_p(VALUE self, VALUE string) {
+    const uint8_t *source = (const uint8_t *) check_string(string);
+    return string_query(pm_string_query_local(source, RSTRING_LEN(string), rb_enc_get(string)->name));
+}
+
+/**
+ * call-seq:
+ *   Prism::StringQuery::constant?(string) -> bool
+ *
+ * Returns true if the string constitutes a valid constant name. Note that this
+ * means the names that can be set through Module#const_set, not necessarily the
+ * ones that can be set through a constant assignment.
+ */
+static VALUE
+string_query_constant_p(VALUE self, VALUE string) {
+    const uint8_t *source = (const uint8_t *) check_string(string);
+    return string_query(pm_string_query_constant(source, RSTRING_LEN(string), rb_enc_get(string)->name));
+}
+
+/**
+ * call-seq:
+ *   Prism::StringQuery::method_name?(string) -> bool
+ *
+ * Returns true if the string constitutes a valid method name.
+ */
+static VALUE
+string_query_method_name_p(VALUE self, VALUE string) {
+    const uint8_t *source = (const uint8_t *) check_string(string);
+    return string_query(pm_string_query_method_name(source, RSTRING_LEN(string), rb_enc_get(string)->name));
+}
+
 /******************************************************************************/
 /* Initialization of the extension                                            */
 /******************************************************************************/
@@ -1170,6 +1232,7 @@ Init_prism(void) {
     rb_cPrismParseResult = rb_define_class_under(rb_cPrism, "ParseResult", rb_cPrismResult);
     rb_cPrismLexResult = rb_define_class_under(rb_cPrism, "LexResult", rb_cPrismResult);
     rb_cPrismParseLexResult = rb_define_class_under(rb_cPrism, "ParseLexResult", rb_cPrismResult);
+    rb_cPrismStringQuery = rb_define_class_under(rb_cPrism, "StringQuery", rb_cObject);
 
     // Intern all of the IDs eagerly that we support so that we don't have to do
     // it every time we parse.
@@ -1211,6 +1274,10 @@ Init_prism(void) {
     rb_define_singleton_method(rb_cPrism, "dump_file", dump_file, -1);
 #endif
 
+    rb_define_singleton_method(rb_cPrismStringQuery, "local?", string_query_local_p, 1);
+    rb_define_singleton_method(rb_cPrismStringQuery, "constant?", string_query_constant_p, 1);
+    rb_define_singleton_method(rb_cPrismStringQuery, "method_name?", string_query_method_name_p, 1);
+
     // Next, initialize the other APIs.
     Init_prism_api_node();
     Init_prism_pack();
diff --git a/prism/prism.c b/prism/prism.c
index 00485b68ad9ff0..07d188dcc8bdf6 100644
--- a/prism/prism.c
+++ b/prism/prism.c
@@ -22642,3 +22642,166 @@ pm_serialize_parse_comments(pm_buffer_t *buffer, const uint8_t *source, size_t s
 }
 
 #endif
+
+/******************************************************************************/
+/* Slice queries for the Ruby API                                             */
+/******************************************************************************/
+
+/** The category of slice returned from pm_slice_type. */
+typedef enum {
+    /** Returned when the given encoding name is invalid. */
+    PM_SLICE_TYPE_ERROR = -1,
+
+    /** Returned when no other types apply to the slice. */
+    PM_SLICE_TYPE_NONE,
+
+    /** Returned when the slice is a valid local variable name. */
+    PM_SLICE_TYPE_LOCAL,
+
+    /** Returned when the slice is a valid constant name. */
+    PM_SLICE_TYPE_CONSTANT,
+
+    /** Returned when the slice is a valid method name. */
+    PM_SLICE_TYPE_METHOD_NAME
+} pm_slice_type_t;
+
+/**
+ * Check that the slice is a valid local variable name or constant.
+ */
+pm_slice_type_t
+pm_slice_type(const uint8_t *source, size_t length, const char *encoding_name) {
+    // first, get the right encoding object
+    const pm_encoding_t *encoding = pm_encoding_find((const uint8_t *) encoding_name, (const uint8_t *) (encoding_name + strlen(encoding_name)));
+    if (encoding == NULL) return PM_SLICE_TYPE_ERROR;
+
+    // check that there is at least one character
+    if (length == 0) return PM_SLICE_TYPE_NONE;
+
+    size_t width;
+    if ((width = encoding->alpha_char(source, (ptrdiff_t) length)) != 0) {
+        // valid because alphabetical
+    } else if (*source == '_') {
+        // valid because underscore
+        width = 1;
+    } else if ((*source >= 0x80) && ((width = encoding->char_width(source, (ptrdiff_t) length)) > 0)) {
+        // valid because multibyte
+    } else {
+        // invalid because no match
+        return PM_SLICE_TYPE_NONE;
+    }
+
+    // determine the type of the slice based on the first character
+    const uint8_t *end = source + length;
+    pm_slice_type_t result = encoding->isupper_char(source, end - source) ? PM_SLICE_TYPE_CONSTANT : PM_SLICE_TYPE_LOCAL;
+
+    // next, iterate through all of the bytes of the string to ensure that they
+    // are all valid identifier characters
+    source += width;
+
+    while (source < end) {
+        if ((width = encoding->alnum_char(source, end - source)) != 0) {
+            // valid because alphanumeric
+            source += width;
+        } else if (*source == '_') {
+            // valid because underscore
+            source++;
+        } else if ((*source >= 0x80) && ((width = encoding->char_width(source, end - source)) > 0)) {
+            // valid because multibyte
+            source += width;
+        } else {
+            // invalid because no match
+            break;
+        }
+    }
+
+    // accept a ! or ? at the end of the slice as a method name
+    if (*source == '!' || *source == '?' || *source == '=') {
+        source++;
+        result = PM_SLICE_TYPE_METHOD_NAME;
+    }
+
+    // valid if we are at the end of the slice
+    return source == end ? result : PM_SLICE_TYPE_NONE;
+}
+
+/**
+ * Check that the slice is a valid local variable name.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t
+pm_string_query_local(const uint8_t *source, size_t length, const char *encoding_name) {
+    switch (pm_slice_type(source, length, encoding_name)) {
+        case PM_SLICE_TYPE_ERROR:
+            return PM_STRING_QUERY_ERROR;
+        case PM_SLICE_TYPE_NONE:
+        case PM_SLICE_TYPE_CONSTANT:
+        case PM_SLICE_TYPE_METHOD_NAME:
+            return PM_STRING_QUERY_FALSE;
+        case PM_SLICE_TYPE_LOCAL:
+            return PM_STRING_QUERY_TRUE;
+    }
+
+    assert(false && "unreachable");
+    return PM_STRING_QUERY_FALSE;
+}
+
+/**
+ * Check that the slice is a valid constant name.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t
+pm_string_query_constant(const uint8_t *source, size_t length, const char *encoding_name) {
+    switch (pm_slice_type(source, length, encoding_name)) {
+        case PM_SLICE_TYPE_ERROR:
+            return PM_STRING_QUERY_ERROR;
+        case PM_SLICE_TYPE_NONE:
+        case PM_SLICE_TYPE_LOCAL:
+        case PM_SLICE_TYPE_METHOD_NAME:
+            return PM_STRING_QUERY_FALSE;
+        case PM_SLICE_TYPE_CONSTANT:
+            return PM_STRING_QUERY_TRUE;
+    }
+
+    assert(false && "unreachable");
+    return PM_STRING_QUERY_FALSE;
+}
+
+/**
+ * Check that the slice is a valid method name.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t
+pm_string_query_method_name(const uint8_t *source, size_t length, const char *encoding_name) {
+#define B(p) ((p) ? PM_STRING_QUERY_TRUE : PM_STRING_QUERY_FALSE)
+#define C1(c) (*source == c)
+#define C2(s) (memcmp(source, s, 2) == 0)
+#define C3(s) (memcmp(source, s, 3) == 0)
+
+    switch (pm_slice_type(source, length, encoding_name)) {
+        case PM_SLICE_TYPE_ERROR:
+            return PM_STRING_QUERY_ERROR;
+        case PM_SLICE_TYPE_NONE:
+            break;
+        case PM_SLICE_TYPE_LOCAL:
+            // numbered parameters are not valid method names
+            return B((length != 2) || (source[0] != '_') || (source[1] == '0') || !pm_char_is_decimal_digit(source[1]));
+        case PM_SLICE_TYPE_CONSTANT:
+            // all constants are valid method names
+        case PM_SLICE_TYPE_METHOD_NAME:
+            // all method names are valid method names
+            return PM_STRING_QUERY_TRUE;
+    }
+
+    switch (length) {
+        case 1:
+            return B(C1('&') || C1('`') || C1('!') || C1('^') || C1('>') || C1('<') || C1('-') || C1('%') || C1('|') || C1('+') || C1('/') || C1('*') || C1('~'));
+        case 2:
+            return B(C2("!=") || C2("!~") || C2("[]") || C2("==") || C2("=~") || C2(">=") || C2(">>") || C2("<=") || C2("<<") || C2("**"));
+        case 3:
+            return B(C3("===") || C3("<=>") || C3("[]="));
+        default:
+            return PM_STRING_QUERY_FALSE;
+    }
+
+#undef B
+#undef C1
+#undef C2
+#undef C3
+}
diff --git a/prism/prism.h b/prism/prism.h
index 755c38fca29248..6f7b850a316c73 100644
--- a/prism/prism.h
+++ b/prism/prism.h
@@ -234,6 +234,53 @@ PRISM_EXPORTED_FUNCTION void pm_dump_json(pm_buffer_t *buffer, const pm_parser_t
 
 #endif
 
+/**
+ * Represents the results of a slice query.
+ */
+typedef enum {
+    /** Returned if the encoding given to a slice query was invalid. */
+    PM_STRING_QUERY_ERROR = -1,
+
+    /** Returned if the result of the slice query is false. */
+    PM_STRING_QUERY_FALSE,
+
+    /** Returned if the result of the slice query is true. */
+    PM_STRING_QUERY_TRUE
+} pm_string_query_t;
+
+/**
+ * Check that the slice is a valid local variable name.
+ *
+ * @param source The source to check.
+ * @param length The length of the source.
+ * @param encoding_name The name of the encoding of the source.
+ * @return PM_STRING_QUERY_TRUE if the query is true, PM_STRING_QUERY_FALSE if
+ *   the query is false, and PM_STRING_QUERY_ERROR if the encoding was invalid.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t pm_string_query_local(const uint8_t *source, size_t length, const char *encoding_name);
+
+/**
+ * Check that the slice is a valid constant name.
+ *
+ * @param source The source to check.
+ * @param length The length of the source.
+ * @param encoding_name The name of the encoding of the source.
+ * @return PM_STRING_QUERY_TRUE if the query is true, PM_STRING_QUERY_FALSE if
+ *   the query is false, and PM_STRING_QUERY_ERROR if the encoding was invalid.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t pm_string_query_constant(const uint8_t *source, size_t length, const char *encoding_name);
+
+/**
+ * Check that the slice is a valid method name.
+ *
+ * @param source The source to check.
+ * @param length The length of the source.
+ * @param encoding_name The name of the encoding of the source.
+ * @return PM_STRING_QUERY_TRUE if the query is true, PM_STRING_QUERY_FALSE if
+ *   the query is false, and PM_STRING_QUERY_ERROR if the encoding was invalid.
+ */
+PRISM_EXPORTED_FUNCTION pm_string_query_t pm_string_query_method_name(const uint8_t *source, size_t length, const char *encoding_name);
+
 /**
  * @mainpage
  *
diff --git a/test/prism/ruby/string_query_test.rb b/test/prism/ruby/string_query_test.rb
new file mode 100644
index 00000000000000..aa50c10ff326a2
--- /dev/null
+++ b/test/prism/ruby/string_query_test.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class StringQueryTest < TestCase
+    def test_local?
+      assert_predicate StringQuery.new("a"), :local?
+      assert_predicate StringQuery.new("a1"), :local?
+      assert_predicate StringQuery.new("self"), :local?
+
+      assert_predicate StringQuery.new("_a"), :local?
+      assert_predicate StringQuery.new("_1"), :local?
+
+      assert_predicate StringQuery.new("😀"), :local?
+      assert_predicate StringQuery.new("ア".encode("Windows-31J")), :local?
+
+      refute_predicate StringQuery.new("1"), :local?
+      refute_predicate StringQuery.new("A"), :local?
+    end
+
+    def test_constant?
+      assert_predicate StringQuery.new("A"), :constant?
+      assert_predicate StringQuery.new("A1"), :constant?
+      assert_predicate StringQuery.new("A_B"), :constant?
+      assert_predicate StringQuery.new("BEGIN"), :constant?
+
+      assert_predicate StringQuery.new("À"), :constant?
+      assert_predicate StringQuery.new("A".encode("US-ASCII")), :constant?
+
+      refute_predicate StringQuery.new("a"), :constant?
+      refute_predicate StringQuery.new("1"), :constant?
+    end
+
+    def test_method_name?
+      assert_predicate StringQuery.new("a"), :method_name?
+      assert_predicate StringQuery.new("A"), :method_name?
+      assert_predicate StringQuery.new("__FILE__"), :method_name?
+
+      assert_predicate StringQuery.new("a?"), :method_name?
+      assert_predicate StringQuery.new("a!"), :method_name?
+      assert_predicate StringQuery.new("a="), :method_name?
+
+      assert_predicate StringQuery.new("+"), :method_name?
+      assert_predicate StringQuery.new("<<"), :method_name?
+      assert_predicate StringQuery.new("==="), :method_name?
+
+      assert_predicate StringQuery.new("_0"), :method_name?
+
+      refute_predicate StringQuery.new("1"), :method_name?
+      refute_predicate StringQuery.new("_1"), :method_name?
+    end
+
+    def test_invalid_encoding
+      assert_raise ArgumentError do
+        StringQuery.new("A".encode("UTF-16LE")).local?
+      end
+    end
+  end
+end

From 2e6ddd968d5601689f59c029bb401d7cdabab3b7 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Fri, 11 Oct 2024 15:42:45 -0400
Subject: [PATCH 025/140] Don't enable GC.auto_compact in
 EnvUtil.under_gc_compact_stress when not supported

---
 tool/lib/envutil.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tool/lib/envutil.rb b/tool/lib/envutil.rb
index 952614b8cf0e12..7b8aa99a39dbac 100644
--- a/tool/lib/envutil.rb
+++ b/tool/lib/envutil.rb
@@ -259,11 +259,15 @@ def under_gc_stress(stress = true)
 
   def under_gc_compact_stress(val = :empty, &block)
     raise "compaction doesn't work well on s390x. Omit the test in the caller." if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
-    auto_compact = GC.auto_compact
-    GC.auto_compact = val
+
+    if GC.respond_to?(:auto_compact)
+      auto_compact = GC.auto_compact
+      GC.auto_compact = val
+    end
+
     under_gc_stress(&block)
   ensure
-    GC.auto_compact = auto_compact
+    GC.auto_compact = auto_compact if GC.respond_to?(:auto_compact)
   end
   module_function :under_gc_compact_stress
 

From ad5641fd3424790789871300b7c0dd6c069f3614 Mon Sep 17 00:00:00 2001
From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
Date: Sat, 12 Oct 2024 10:08:34 +1300
Subject: [PATCH 026/140] Support `IO#timeout` for `rsock_connect`. (#11880)

---
 ext/socket/init.c                             | 23 ++++++++++---------
 ext/socket/ipsocket.c                         |  9 +-------
 ext/socket/rubysocket.h                       |  2 +-
 ext/socket/socket.c                           |  7 +++---
 ext/socket/udpsocket.c                        |  2 +-
 ext/socket/unixsocket.c                       |  2 +-
 .../library/socket/socket/connect_spec.rb     | 14 +++++++++++
 7 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/ext/socket/init.c b/ext/socket/init.c
index b02ac5fef5748f..83af8c5b0e090e 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -473,10 +473,11 @@ rsock_socket(int domain, int type, int proto)
 
 /* emulate blocking connect behavior on EINTR or non-blocking socket */
 static int
-wait_connectable(int fd, struct timeval *timeout)
+wait_connectable(VALUE self, VALUE timeout)
 {
-    int sockerr, revents;
+    int sockerr;
     socklen_t sockerrlen;
+    int fd = rb_io_descriptor(self);
 
     sockerrlen = (socklen_t)sizeof(sockerr);
     if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen) < 0)
@@ -510,7 +511,13 @@ wait_connectable(int fd, struct timeval *timeout)
      *
      * Note: rb_wait_for_single_fd already retries on EINTR/ERESTART
      */
-    revents = rb_wait_for_single_fd(fd, RB_WAITFD_IN|RB_WAITFD_OUT, timeout);
+    VALUE result = rb_io_wait(self, RB_INT2NUM(RUBY_IO_READABLE|RUBY_IO_WRITABLE), timeout);
+
+    if (result == Qfalse) {
+        rb_raise(rb_eIOTimeoutError, "Connect timed out!");
+    }
+
+    int revents = RB_NUM2INT(result);
 
     if (revents < 0)
         return -1;
@@ -525,12 +532,6 @@ wait_connectable(int fd, struct timeval *timeout)
          * be defensive in case some platforms set SO_ERROR on the original,
          * interrupted connect()
          */
-
-        /* when the connection timed out, no errno is set and revents is 0. */
-        if (timeout && revents == 0) {
-            errno = ETIMEDOUT;
-            return -1;
-        }
       case EINTR:
 #ifdef ERESTART
       case ERESTART:
@@ -578,7 +579,7 @@ socks_connect_blocking(void *data)
 #endif
 
 int
-rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout)
+rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, VALUE timeout)
 {
     int descriptor = rb_io_descriptor(self);
     rb_blocking_function_t *func = connect_blocking;
@@ -602,7 +603,7 @@ rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, s
 #ifdef EINPROGRESS
           case EINPROGRESS:
 #endif
-            return wait_connectable(descriptor, timeout);
+            return wait_connectable(self, timeout);
         }
     }
     return status;
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index 7992212b87c324..3de84454355b66 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -55,13 +55,6 @@ init_inetsock_internal(VALUE v)
     int family = AF_UNSPEC;
     const char *syscall = 0;
     VALUE connect_timeout = arg->connect_timeout;
-    struct timeval tv_storage;
-    struct timeval *tv = NULL;
-
-    if (!NIL_P(connect_timeout)) {
-        tv_storage = rb_time_interval(connect_timeout);
-        tv = &tv_storage;
-    }
 
     arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv,
                                      family, SOCK_STREAM,
@@ -130,7 +123,7 @@ init_inetsock_internal(VALUE v)
             }
 
             if (status >= 0) {
-                status = rsock_connect(io, res->ai_addr, res->ai_addrlen, (type == INET_SOCKS), tv);
+                status = rsock_connect(io, res->ai_addr, res->ai_addrlen, (type == INET_SOCKS), connect_timeout);
                 syscall = "connect(2)";
             }
         }
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index e4ab412f6e834a..b4daa66071a472 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -379,7 +379,7 @@ VALUE rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
                                 VALUE ex, enum sock_recv_type from);
 VALUE rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
 
-int rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout);
+int rsock_connect(VALUE self, const struct sockaddr *sockaddr, int len, int socks, VALUE timeout);
 
 VALUE rsock_s_accept(VALUE klass, VALUE io, struct sockaddr *sockaddr, socklen_t *len);
 VALUE rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index c974aafe55102c..487a293c4e2e61 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -387,16 +387,15 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
  * * connect function in Microsoft's Winsock functions reference
  */
 static VALUE
-sock_connect(VALUE sock, VALUE addr)
+sock_connect(VALUE self, VALUE addr)
 {
     VALUE rai;
-    rb_io_t *fptr;
 
     SockAddrStringValueWithAddrinfo(addr, rai);
     addr = rb_str_new4(addr);
-    GetOpenFile(sock, fptr);
 
-    int result = rsock_connect(sock, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0, NULL);
+    int result = rsock_connect(self, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0, RUBY_IO_TIMEOUT_DEFAULT);
+
     if (result < 0) {
         rsock_sys_fail_raddrinfo_or_sockaddr("connect(2)", addr, rai);
     }
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index c31e9dbf6facac..a984933c9fd3fe 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -56,7 +56,7 @@ udp_connect_internal(VALUE v)
     struct addrinfo *res;
 
     for (res = arg->res->ai; res; res = res->ai_next) {
-        if (rsock_connect(arg->io, res->ai_addr, res->ai_addrlen, 0, NULL) >= 0) {
+        if (rsock_connect(arg->io, res->ai_addr, res->ai_addrlen, 0, RUBY_IO_TIMEOUT_DEFAULT) >= 0) {
             return Qtrue;
         }
     }
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index 11d7c0451fee96..31e2acee04e896 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -21,7 +21,7 @@ static VALUE
 unixsock_connect_internal(VALUE a)
 {
     struct unixsock_arg *arg = (struct unixsock_arg *)a;
-    return (VALUE)rsock_connect(arg->io, (struct sockaddr*)arg->sockaddr, arg->sockaddrlen, 0, NULL);
+    return (VALUE)rsock_connect(arg->io, (struct sockaddr*)arg->sockaddr, arg->sockaddrlen, 0, RUBY_IO_TIMEOUT_DEFAULT);
 }
 
 static VALUE
diff --git a/spec/ruby/library/socket/socket/connect_spec.rb b/spec/ruby/library/socket/socket/connect_spec.rb
index 8653fba552bdcd..175c9942bcd667 100644
--- a/spec/ruby/library/socket/socket/connect_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_spec.rb
@@ -53,4 +53,18 @@
       end
     end
   end
+
+  ruby_version_is "3.4" do
+    it "fails with timeout" do
+      # TEST-NET-1 IP address are reserved for documentation and example purposes.
+      address = Socket.pack_sockaddr_in(1, "192.0.2.1")
+
+      client = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM)
+      client.timeout = 0
+
+      -> {
+        client.connect(address)
+      }.should raise_error(IO::TimeoutError)
+    end
+  end
 end

From 199b2980496a6725f4bb44bc6e9088c800f67a50 Mon Sep 17 00:00:00 2001
From: tomoya ishida <tomoyapenguin@gmail.com>
Date: Sat, 12 Oct 2024 13:24:32 +0900
Subject: [PATCH 027/140] [ruby/irb] Make rendering test faster using updated
 yamatanooroti (https://github.com/ruby/irb/pull/1001)

https://github.com/ruby/irb/commit/2c2956bc1f
---
 test/irb/yamatanooroti/test_rendering.rb | 169 ++++++++---------------
 1 file changed, 55 insertions(+), 114 deletions(-)

diff --git a/test/irb/yamatanooroti/test_rendering.rb b/test/irb/yamatanooroti/test_rendering.rb
index 834c501d5c6035..57aa0ecb3cc189 100644
--- a/test/irb/yamatanooroti/test_rendering.rb
+++ b/test/irb/yamatanooroti/test_rendering.rb
@@ -39,49 +39,44 @@ def teardown
   end
 
   def test_launch
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write(<<~EOC)
       'Hello, World!'
     EOC
-    close
     assert_screen(<<~EOC)
-      start IRB
       irb(main):001> 'Hello, World!'
       => "Hello, World!"
       irb(main):002>
     EOC
+    close
   end
 
   def test_configuration_file_is_skipped_with_dash_f
     write_irbrc <<~'LINES'
       puts '.irbrc file should be ignored when -f is used'
     LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb -f}, startup_message: '')
+    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb -f}, startup_message: /irb\(main\)/)
     write(<<~EOC)
       'Hello, World!'
     EOC
-    close
     assert_screen(<<~EOC)
       irb(main):001> 'Hello, World!'
       => "Hello, World!"
       irb(main):002>
     EOC
+    close
   end
 
   def test_configuration_file_is_skipped_with_dash_f_for_nested_sessions
     write_irbrc <<~'LINES'
       puts '.irbrc file should be ignored when -f is used'
     LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb -f}, startup_message: '')
+    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb -f}, startup_message: /irb\(main\)/)
     write(<<~EOC)
       'Hello, World!'
       binding.irb
       exit!
     EOC
-    close
     assert_screen(<<~EOC)
       irb(main):001> 'Hello, World!'
       => "Hello, World!"
@@ -89,13 +84,11 @@ def test_configuration_file_is_skipped_with_dash_f_for_nested_sessions
       irb(main):003> exit!
       irb(main):001>
     EOC
+    close
   end
 
   def test_nomultiline
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb --nomultiline}, startup_message: 'start IRB')
+    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb --nomultiline}, startup_message: /irb\(main\)/)
     write(<<~EOC)
       if true
       if false
@@ -105,9 +98,7 @@ def test_nomultiline
       end
       end
     EOC
-    close
     assert_screen(<<~EOC)
-      start IRB
       irb(main):001> if true
       irb(main):002*   if false
       irb(main):003*     a = "hello
@@ -118,13 +109,11 @@ def test_nomultiline
       => nil
       irb(main):008>
     EOC
+    close
   end
 
   def test_multiline_paste
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(25, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write(<<~EOC)
       class A
         def inspect; '#<A>'; end
@@ -139,9 +128,7 @@ def b; true; end
        .b
       .itself
     EOC
-    close
     assert_screen(<<~EOC)
-      start IRB
       irb(main):001* class A
       irb(main):002*   def inspect; '#<A>'; end
       irb(main):003*   def a; self; end
@@ -159,13 +146,11 @@ def b; true; end
       => true
       irb(main):013>
     EOC
+    close
   end
 
   def test_evaluate_each_toplevel_statement_by_multiline_paste
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write(<<~EOC)
       class A
         def inspect; '#<A>'; end
@@ -193,9 +178,7 @@ class A def b; self; end; def c; true; end; end;
         &.b()
       .itself
     EOC
-    close
     assert_screen(<<~EOC)
-      start IRB
       irb(main):001* class A
       irb(main):002*   def inspect; '#<A>'; end
       irb(main):003*   def b; self; end
@@ -230,36 +213,28 @@ class A def b; self; end; def c; true; end; end;
       => #<A>
       irb(main):026>
     EOC
+    close
   end
 
   def test_symbol_with_backtick
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write(<<~EOC)
       :`
     EOC
-    close
     assert_screen(<<~EOC)
-      start IRB
       irb(main):001> :`
       => :`
       irb(main):002>
     EOC
+    close
   end
 
   def test_autocomplete_with_multiple_doc_namespaces
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(3, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(3, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write("{}.__id_")
     write("\C-i")
-    sleep 0.2
+    assert_screen(/irb\(main\):001> {}\.__id__\n                }\.__id__(?:Press )?/)
     close
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/start\ IRB\nirb\(main\):001> {}\.__id__\n                }\.__id__(?:Press )?/, screen)
   end
 
   def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_right
@@ -273,31 +248,27 @@ def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_right
         :PROMPT_C => "%03n> "
       }
       IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-      puts 'start IRB'
     LINES
-    start_terminal(4, 19, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(4, 19, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /001>/)
     write("IR")
     write("\C-i")
-    sleep 0.2
-    close
 
     # This is because on macOS we display different shortcut for displaying the full doc
     # 'O' is for 'Option' and 'A' is for 'Alt'
     if RUBY_PLATFORM =~ /darwin/
       assert_screen(<<~EOC)
-        start IRB
         001> IRB
              IRBPress Opti
                 IRB
       EOC
     else
       assert_screen(<<~EOC)
-        start IRB
         001> IRB
              IRBPress Alt+
                 IRB
       EOC
     end
+    close
   end
 
   def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_left
@@ -311,154 +282,129 @@ def test_autocomplete_with_showdoc_in_gaps_on_narrow_screen_left
         :PROMPT_C => "%03n> "
       }
       IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-      puts 'start IRB'
     LINES
-    start_terminal(4, 12, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(4, 12, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /001>/)
     write("IR")
     write("\C-i")
-    sleep 0.2
-    close
     assert_screen(<<~EOC)
-      start IRB
       001> IRB
       PressIRB
       IRB
     EOC
+    close
   end
 
   def test_assignment_expression_truncate
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     # Assignment expression code that turns into non-assignment expression after evaluation
     code = "a /'/i if false; a=1; x=1000.times.to_a#'.size"
     write(code + "\n")
-    close
     assert_screen(<<~EOC)
-      start IRB
       irb(main):001> #{code}
       =>
       [0,
       ...
       irb(main):002>
     EOC
+    close
   end
 
   def test_ctrl_c_is_handled
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     # Assignment expression code that turns into non-assignment expression after evaluation
     write("\C-c")
-    close
     assert_screen(<<~EOC)
-      start IRB
       irb(main):001>
       ^C
       irb(main):001>
     EOC
+    close
   end
 
   def test_show_cmds_with_pager_can_quit_with_ctrl_c
-    write_irbrc <<~'LINES'
-      puts 'start IRB'
-    LINES
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write("help\n")
     write("G") # move to the end of the screen
     write("\C-c") # quit pager
     write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
 
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    # IRB::Abort should be rescued
-    assert_not_match(/IRB::Abort/, screen)
     # IRB should resume
-    assert_match(/foobar/, screen)
+    assert_screen(/foobar/)
+    # IRB::Abort should be rescued
+    assert_screen(/\A(?!IRB::Abort)/)
+    close
   end
 
   def test_pager_page_content_pages_output_when_it_does_not_fit_in_the_screen_because_of_total_length
     write_irbrc <<~'LINES'
-      puts 'start IRB'
       require "irb/pager"
     LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write("IRB::Pager.page_content('a' * (80 * 8))\n")
     write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
 
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/a{80}/, screen)
+    assert_screen(/a{80}/)
     # because pager is invoked, foobar will not be evaluated
-    assert_not_match(/foobar/, screen)
+    assert_screen(/\A(?!foobar)/)
+    close
   end
 
   def test_pager_page_content_pages_output_when_it_does_not_fit_in_the_screen_because_of_screen_height
     write_irbrc <<~'LINES'
-      puts 'start IRB'
       require "irb/pager"
     LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write("IRB::Pager.page_content('a\n' * 8)\n")
     write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
 
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/(a\n){8}/, screen)
+    assert_screen(/(a\n){8}/)
     # because pager is invoked, foobar will not be evaluated
-    assert_not_match(/foobar/, screen)
+    assert_screen(/\A(?!foobar)/)
+    close
   end
 
   def test_pager_page_content_doesnt_page_output_when_it_fits_in_the_screen
     write_irbrc <<~'LINES'
-      puts 'start IRB'
       require "irb/pager"
     LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write("IRB::Pager.page_content('a' * (80 * 7))\n")
     write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
 
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/a{80}/, screen)
+    assert_screen(/a{80}/)
     # because pager is not invoked, foobar will be evaluated
-    assert_match(/foobar/, screen)
+    assert_screen(/foobar/)
+    close
   end
 
   def test_long_evaluation_output_is_paged
     write_irbrc <<~'LINES'
-      puts 'start IRB'
       require "irb/pager"
     LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write("'a' * 80 * 11\n")
     write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
 
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_match(/(a{80}\n){8}/, screen)
+    assert_screen(/(a{80}\n){8}/)
     # because pager is invoked, foobar will not be evaluated
-    assert_not_match(/foobar/, screen)
+    assert_screen(/\A(?!foobar)/)
+    close
   end
 
   def test_long_evaluation_output_is_preserved_after_paging
     write_irbrc <<~'LINES'
-      puts 'start IRB'
       require "irb/pager"
     LINES
-    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: 'start IRB')
+    start_terminal(10, 80, %W{ruby -I#{@pwd}/lib #{@pwd}/exe/irb}, startup_message: /irb\(main\)/)
     write("'a' * 80 * 11\n")
     write("q") # quit pager
     write("'foo' + 'bar'\n") # eval something to make sure IRB resumes
-    close
 
-    screen = result.join("\n").sub(/\n*\z/, "\n")
     # confirm pager has exited
-    assert_match(/foobar/, screen)
+    assert_screen(/foobar/)
     # confirm output is preserved
-    assert_match(/(a{80}\n){6}/, screen)
+    assert_screen(/(a{80}\n){6}/)
+    close
   end
 
   def test_debug_integration_hints_debugger_commands
@@ -467,21 +413,19 @@ def test_debug_integration_hints_debugger_commands
     LINES
     script = Tempfile.create(["debug", ".rb"])
     script.write <<~RUBY
-      puts 'start IRB'
       binding.irb
     RUBY
     script.close
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: 'start IRB')
+    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: /irb\(main\)/)
     write("debug\n")
     write("pp 1\n")
     write("pp 1")
-    close
 
-    screen = result.join("\n").sub(/\n*\z/, "\n")
     # submitted input shouldn't contain hint
-    assert_include(screen, "irb:rdbg(main):002> pp 1\n")
+    assert_screen(/irb:rdbg\(main\):002> pp 1\n/)
     # unsubmitted input should contain hint
-    assert_include(screen, "irb:rdbg(main):003> pp 1 # debug command\n")
+    assert_screen(/irb:rdbg\(main\):003> pp 1 # debug command\n/)
+    close
   ensure
     File.unlink(script) if script
   end
@@ -492,17 +436,14 @@ def test_debug_integration_doesnt_hint_non_debugger_commands
     LINES
     script = Tempfile.create(["debug", ".rb"])
     script.write <<~RUBY
-      puts 'start IRB'
       binding.irb
     RUBY
     script.close
-    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: 'start IRB')
+    start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: /irb\(main\)/)
     write("debug\n")
     write("foo")
+    assert_screen(/irb:rdbg\(main\):002> foo\n/)
     close
-
-    screen = result.join("\n").sub(/\n*\z/, "\n")
-    assert_include(screen, "irb:rdbg(main):002> foo\n")
   ensure
     File.unlink(script) if script
   end

From afacb8ada5788299468cce6247601412e12002a4 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Sat, 12 Oct 2024 22:48:10 +1000
Subject: [PATCH 028/140] [DOC] Fix spelling

---
 ext/zlib/zlib.c                     |  4 ++--
 lib/reline/line_editor.rb           | 12 ++++++------
 test/reline/test_key_actor_emacs.rb |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 50d8dd40c6580c..0899861c028f75 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1521,7 +1521,7 @@ rb_zstream_total_out(VALUE obj)
 }
 
 /*
- * Guesses the type of the data which have been inputed into the stream. The
+ * Guesses the type of the data which have been inputted into the stream. The
  * returned value is either <tt>BINARY</tt>, <tt>ASCII</tt>, or
  * <tt>UNKNOWN</tt>.
  */
@@ -4054,7 +4054,7 @@ rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
  *  call-seq:
  *     gzipreader.readpartial(maxlen [, outbuf]) => string, outbuf
  *
- *  Reads at most <i>maxlen</i> bytes from the gziped stream but
+ *  Reads at most <i>maxlen</i> bytes from the gzipped stream but
  *  it blocks only if <em>gzipreader</em> has no data immediately available.
  *  If the optional <i>outbuf</i> argument is present,
  *  it must reference a String, which will receive the data.
diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
index b8156597135430..e01d859262b4ea 100644
--- a/lib/reline/line_editor.rb
+++ b/lib/reline/line_editor.rb
@@ -2368,9 +2368,9 @@ def finish
 
   private def search_next_char(key, arg, need_prev_char: false, inclusive: false)
     if key.instance_of?(String)
-      inputed_char = key
+      inputted_char = key
     else
-      inputed_char = key.chr
+      inputted_char = key.chr
     end
     prev_total = nil
     total = nil
@@ -2382,7 +2382,7 @@ def finish
         width = Reline::Unicode.get_mbchar_width(mbchar)
         total = [mbchar.bytesize, width]
       else
-        if inputed_char == mbchar
+        if inputted_char == mbchar
           arg -= 1
           if arg.zero?
             found = true
@@ -2420,9 +2420,9 @@ def finish
 
   private def search_prev_char(key, arg, need_next_char = false)
     if key.instance_of?(String)
-      inputed_char = key
+      inputted_char = key
     else
-      inputed_char = key.chr
+      inputted_char = key.chr
     end
     prev_total = nil
     total = nil
@@ -2434,7 +2434,7 @@ def finish
         width = Reline::Unicode.get_mbchar_width(mbchar)
         total = [mbchar.bytesize, width]
       else
-        if inputed_char == mbchar
+        if inputted_char == mbchar
           arg -= 1
           if arg.zero?
             found = true
diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb
index dc12c803f57787..cd8971298d1fb7 100644
--- a/test/reline/test_key_actor_emacs.rb
+++ b/test/reline/test_key_actor_emacs.rb
@@ -260,7 +260,7 @@ def test_ed_clear_screen
     assert_empty(@line_editor.instance_variable_get(:@rendered_screen).lines)
   end
 
-  def test_ed_clear_screen_with_inputed
+  def test_ed_clear_screen_with_inputted
     input_keys('abc')
     input_keys("\C-b", false)
     @line_editor.instance_variable_get(:@rendered_screen).lines = [[]]

From 81910a93ff2688fc1a6d4a5200782869105e8872 Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Sat, 12 Oct 2024 09:36:29 -0500
Subject: [PATCH 029/140] [DOC] Tweaks for Array#shift (#11886)

---
 array.c | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/array.c b/array.c
index b6768e52d3b4c7..015395f74caa72 100644
--- a/array.c
+++ b/array.c
@@ -1512,35 +1512,40 @@ rb_ary_shift(VALUE ary)
 
 /*
  *  call-seq:
- *     array.shift -> object or nil
- *     array.shift(n) -> new_array
+ *    shift -> object or nil
+ *    shift(count) -> new_array or nil
  *
- *  Removes and returns leading elements.
+ *  Removes and returns leading elements from +self+.
  *
- *  When no argument is given, removes and returns the first element:
+ *  With no argument, removes and returns one element, if available,
+ *  or +nil+ otherwise:
  *
- *    a = [:foo, 'bar', 2]
- *    a.shift # => :foo
- *    a # => ['bar', 2]
- *
- *  Returns +nil+ if +self+ is empty.
+ *    a = [0, 1, 2, 3]
+ *    a.shift  # => 0
+ *    a        # => [1, 2, 3]
+ *    [].shift # => nil
  *
- *  When positive Integer argument +n+ is given, removes the first +n+ elements;
- *  returns those elements in a new +Array+:
+ *  With non-negative numeric argument +count+ given,
+ *  removes and returns the first +count+ elements:
  *
- *    a = [:foo, 'bar', 2]
- *    a.shift(2) # => [:foo, 'bar']
- *    a # => [2]
+ *    a = [0, 1, 2, 3]
+ *    a.shift(2)   # => [0, 1]
+ *    a            # => [2, 3]
+ *    a.shift(1.1) # => [2]
+ *    a            # => [3]
+ *    a.shift(0)   # => []
+ *    a            # => [3]
  *
- *  If +n+ is as large as or larger than <tt>self.length</tt>,
- *  removes all elements; returns those elements in a new +Array+:
+ *  If +count+ is large,
+ *  removes and returns all elements:
  *
- *    a = [:foo, 'bar', 2]
- *    a.shift(3) # => [:foo, 'bar', 2]
+ *    a = [0, 1, 2, 3]
+ *    a.shift(50) # => [0, 1, 2, 3]
+ *    a           # => []
  *
- *  If +n+ is zero, returns a new empty +Array+; +self+ is unmodified.
+ *  If +self+ is empty, returns a new empty array.
  *
- *  Related: #push, #pop, #unshift.
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE

From c12c95462a22551af2f0437cd08136b55c4bb4b7 Mon Sep 17 00:00:00 2001
From: tomoya ishida <tomoyapenguin@gmail.com>
Date: Sun, 13 Oct 2024 13:30:30 +0900
Subject: [PATCH 030/140] [ruby/irb] Fix rendering test broken by conflict
 (https://github.com/ruby/irb/pull/1016)

https://github.com/ruby/irb/commit/a21b953a99
---
 test/irb/yamatanooroti/test_rendering.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/irb/yamatanooroti/test_rendering.rb b/test/irb/yamatanooroti/test_rendering.rb
index 57aa0ecb3cc189..ac6ce5346ea6c9 100644
--- a/test/irb/yamatanooroti/test_rendering.rb
+++ b/test/irb/yamatanooroti/test_rendering.rb
@@ -461,11 +461,9 @@ def test_debug_integration_doesnt_hint_debugger_commands_in_nomultiline_mode
     start_terminal(40, 80, %W{ruby -I#{@pwd}/lib #{script.to_path}}, startup_message: 'start IRB')
     write("debug\n")
     write("pp 1")
-    close
-
-    screen = result.join("\n").sub(/\n*\z/, "\n")
     # submitted input shouldn't contain hint
-    assert_include(screen, "irb:rdbg(main):002> pp 1\n")
+    assert_screen(/irb:rdbg\(main\):002> pp 1\n/)
+    close
   ensure
     File.unlink(script) if script
   end

From 98fce00cab460be81cb1f5e4cf8c0d66e006a35b Mon Sep 17 00:00:00 2001
From: tomoya ishida <tomoyapenguin@gmail.com>
Date: Sun, 13 Oct 2024 13:55:38 +0900
Subject: [PATCH 031/140] [ruby/reline] Support continuous tab completion
 (https://github.com/ruby/reline/pull/761)

Continuous tab completion is possible in GNU Readline.
If dig_perfect_match_proc is set, continuous tab completion will be disabled.

https://github.com/ruby/reline/commit/469a52846b
---
 lib/reline/line_editor.rb           |  6 +++++-
 test/reline/test_key_actor_emacs.rb | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
index e01d859262b4ea..f6627ca430a5a9 100644
--- a/lib/reline/line_editor.rb
+++ b/lib/reline/line_editor.rb
@@ -846,7 +846,11 @@ def editing_mode
     when CompletionState::NORMAL
       @completion_state = CompletionState::COMPLETION
     when CompletionState::PERFECT_MATCH
-      @dig_perfect_match_proc&.(@perfect_matched)
+      if @dig_perfect_match_proc
+        @dig_perfect_match_proc.(@perfect_matched)
+      else
+        @completion_state = CompletionState::COMPLETION
+      end
     end
     if just_show_list
       is_menu = true
diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb
index cd8971298d1fb7..2ebd91dc2ecf45 100644
--- a/test/reline/test_key_actor_emacs.rb
+++ b/test/reline/test_key_actor_emacs.rb
@@ -920,6 +920,29 @@ def test_completion_with_perfect_match
     assert_equal('foo_bar', matched)
   end
 
+  def test_continuous_completion_with_perfect_match
+    @line_editor.completion_proc = proc { |word|
+      word == 'f' ? ['foo'] : %w[foobar foobaz]
+    }
+    input_keys('f')
+    input_keys("\C-i", false)
+    assert_line_around_cursor('foo', '')
+    input_keys("\C-i", false)
+    assert_line_around_cursor('fooba', '')
+  end
+
+  def test_continuous_completion_disabled_with_perfect_match
+    @line_editor.completion_proc = proc { |word|
+      word == 'f' ? ['foo'] : %w[foobar foobaz]
+    }
+    @line_editor.dig_perfect_match_proc = proc {}
+    input_keys('f')
+    input_keys("\C-i", false)
+    assert_line_around_cursor('foo', '')
+    input_keys("\C-i", false)
+    assert_line_around_cursor('foo', '')
+  end
+
   def test_completion_with_completion_ignore_case
     @line_editor.completion_proc = proc { |word|
       %w{

From 6393d2950ddcaa75f92cde9917cf3e4edf9b5347 Mon Sep 17 00:00:00 2001
From: S-H-GAMELINKS <gamelinks007@gmail.com>
Date: Sat, 12 Oct 2024 21:45:42 +0900
Subject: [PATCH 032/140] [ruby/prism] Supress string_query function warning

https://github.com/ruby/prism/commit/0635814327
---
 prism/extension.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prism/extension.c b/prism/extension.c
index 47603fd9b4f506..26415c2b6da977 100644
--- a/prism/extension.c
+++ b/prism/extension.c
@@ -1153,6 +1153,7 @@ string_query(pm_string_query_t result) {
         case PM_STRING_QUERY_TRUE:
             return Qtrue;
     }
+    return Qfalse;
 }
 
 /**

From cf8388f76c4c2ff2f46d0d2aa2cf5186e05ff606 Mon Sep 17 00:00:00 2001
From: tomoya ishida <tomoyapenguin@gmail.com>
Date: Sun, 13 Oct 2024 22:00:17 +0900
Subject: [PATCH 033/140] [ruby/irb] Remove bignum check from save_history
 (https://github.com/ruby/irb/pull/1018)

IRB need to accept bignum history size, but we don't want explicit bignum checks because threshold of bignum and fixnum depends on platform.

https://github.com/ruby/irb/commit/5151467e6a
---
 lib/irb/history.rb | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/lib/irb/history.rb b/lib/irb/history.rb
index a428003d2de946..25fa71b9c3721d 100644
--- a/lib/irb/history.rb
+++ b/lib/irb/history.rb
@@ -5,10 +5,7 @@ module History
     class << self
       # Integer representation of <code>IRB.conf[:HISTORY_FILE]</code>.
       def save_history
-        num = IRB.conf[:SAVE_HISTORY].to_i
-        # Bignums cause RangeErrors when slicing arrays.
-        # Treat such values as 'infinite'.
-        (num > save_history_max) ? -1 : num
+        IRB.conf[:SAVE_HISTORY].to_i
       end
 
       def save_history?
@@ -27,13 +24,6 @@ def history_file
           IRB.rc_file("_history")
         end
       end
-
-      private
-
-      def save_history_max
-        # Max fixnum (32-bit) that can be used without getting RangeError.
-        2**30 - 1
-      end
     end
   end
 
@@ -90,7 +80,8 @@ def save_history
         hist = history.map { |l| l.scrub.split("\n").join("\\\n") }
 
         unless append_history || History.infinite?
-          hist = hist.last(History.save_history)
+          # Check size before slicing because array.last(huge_number) raises RangeError.
+          hist = hist.last(History.save_history) if hist.size > History.save_history
         end
 
         f.puts(hist)

From 0641951e7bd3fa7b8032a5a1206d15cfab8fae4f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 14 Oct 2024 13:17:55 +0900
Subject: [PATCH 034/140] `2digits` macros

---
 time.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/time.c b/time.c
index 54db29c2af1d33..8abcc520efd97b 100644
--- a/time.c
+++ b/time.c
@@ -2153,6 +2153,9 @@ invalid_utc_offset(VALUE zone)
              zone);
 }
 
+#define have_2digits(ptr) (ISDIGIT((ptr)[0]) && ISDIGIT((ptr)[1]))
+#define num_from_2digits(ptr) ((ptr)[0] * 10 + (ptr)[1] - '0' * 11)
+
 static VALUE
 utc_offset_arg(VALUE arg)
 {
@@ -2207,18 +2210,18 @@ utc_offset_arg(VALUE arg)
             goto invalid_utc_offset;
         }
         if (sec) {
-            if (!ISDIGIT(sec[0]) || !ISDIGIT(sec[1])) goto invalid_utc_offset;
-            n += (sec[0] * 10 + sec[1] - '0' * 11);
+            if (!have_2digits(sec)) goto invalid_utc_offset;
+            n += num_from_2digits(sec);
             ASSUME(min);
         }
         if (min) {
-            if (!ISDIGIT(min[0]) || !ISDIGIT(min[1])) goto invalid_utc_offset;
+            if (!have_2digits(min)) goto invalid_utc_offset;
             if (min[0] > '5') goto invalid_utc_offset;
-            n += (min[0] * 10 + min[1] - '0' * 11) * 60;
+            n += num_from_2digits(min) * 60;
         }
         if (s[0] != '+' && s[0] != '-') goto invalid_utc_offset;
-        if (!ISDIGIT(s[1]) || !ISDIGIT(s[2])) goto invalid_utc_offset;
-        n += (s[1] * 10 + s[2] - '0' * 11) * 3600;
+        if (!have_2digits(s+1)) goto invalid_utc_offset;
+        n += num_from_2digits(s+1) * 3600;
         if (s[0] == '-') {
             if (n == 0) return UTC_ZONE;
             n = -n;
@@ -2528,8 +2531,7 @@ static int
 two_digits(const char *ptr, const char *end, const char **endp, const char *name)
 {
     ssize_t len = end - ptr;
-    if (len < 2 || (!ISDIGIT(ptr[0]) || !ISDIGIT(ptr[1])) ||
-        ((len > 2) && ISDIGIT(ptr[2]))) {
+    if (len < 2 || !have_2digits(ptr) || ((len > 2) && ISDIGIT(ptr[2]))) {
         VALUE mesg = rb_sprintf("two digits %s is expected", name);
         if (ptr[-1] == '-' || ptr[-1] == ':') {
             rb_str_catf(mesg, " after '%c'", ptr[-1]);
@@ -2538,7 +2540,7 @@ two_digits(const char *ptr, const char *end, const char **endp, const char *name
         rb_exc_raise(rb_exc_new_str(rb_eArgError, mesg));
     }
     *endp = ptr + 2;
-    return (ptr[0] - '0') * 10 + (ptr[1] - '0');
+    return num_from_2digits(ptr);
 }
 
 static VALUE

From 9611c619ac60e9aeb0341b0c8cf322a42707ce38 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 14 Oct 2024 13:55:55 +0900
Subject: [PATCH 035/140] [Bug #20797] Check seconds in UTC offset as well as
 minutes

---
 spec/ruby/core/time/new_spec.rb |  6 +++---
 test/ruby/test_time.rb          | 12 ++++++++++++
 time.c                          |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/spec/ruby/core/time/new_spec.rb b/spec/ruby/core/time/new_spec.rb
index d686355270c75d..9b3e4f90f3db25 100644
--- a/spec/ruby/core/time/new_spec.rb
+++ b/spec/ruby/core/time/new_spec.rb
@@ -625,15 +625,15 @@ def obj.to_int; 3; end
 
         -> {
           Time.new("2020-12-25 00:56:17 +23:59:60")
-        }.should raise_error(ArgumentError, "utc_offset out of range")
+        }.should raise_error(ArgumentError, /utc_offset/)
 
         -> {
           Time.new("2020-12-25 00:56:17 +24:00")
-        }.should raise_error(ArgumentError, "utc_offset out of range")
+        }.should raise_error(ArgumentError, /utc_offset/)
 
         -> {
           Time.new("2020-12-25 00:56:17 +23:61")
-        }.should raise_error(ArgumentError, '"+HH:MM", "-HH:MM", "UTC" or "A".."I","K".."Z" expected for utc_offset: +23:61')
+        }.should raise_error(ArgumentError, /utc_offset/)
       end
 
       it "raises ArgumentError if string has not ascii-compatible encoding" do
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 99ee84f247e2d0..333edb80218a64 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -152,6 +152,18 @@ def test_new_from_string
     assert_raise_with_message(ArgumentError, /can't parse/) {
       Time.new("2020-12-02 00:00:00 ")
     }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +0960")
+    }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +09:60")
+    }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +090060")
+    }
+    assert_raise_with_message(ArgumentError, /utc_offset/) {
+      Time.new("2020-12-25 00:00:00 +09:00:60")
+    }
   end
 
   def test_time_add()
diff --git a/time.c b/time.c
index 8abcc520efd97b..3c8ff365164caf 100644
--- a/time.c
+++ b/time.c
@@ -2211,6 +2211,7 @@ utc_offset_arg(VALUE arg)
         }
         if (sec) {
             if (!have_2digits(sec)) goto invalid_utc_offset;
+            if (sec[0] > '5') goto invalid_utc_offset;
             n += num_from_2digits(sec);
             ASSUME(min);
         }

From 1001ea9606fd9bbbce70deaab0e6a31c5af1a20c Mon Sep 17 00:00:00 2001
From: git <svn-admin@ruby-lang.org>
Date: Mon, 14 Oct 2024 07:01:30 +0000
Subject: [PATCH 036/140] Update bundled gems list as of 2024-10-13

---
 NEWS.md           | 2 +-
 gems/bundled_gems | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 89aad671870881..25e42db1a944eb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -107,7 +107,7 @@ The following bundled gems are updated.
 * rexml 3.3.8
 * rss 0.3.1
 * net-ftp 0.3.8
-* net-imap 0.4.16
+* net-imap 0.4.17
 * net-smtp 0.5.0
 * rbs 3.6.1
 * typeprof 0.21.11
diff --git a/gems/bundled_gems b/gems/bundled_gems
index 0e88f06f21f422..8d0fc34ba0a3cb 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -13,7 +13,7 @@ test-unit           3.6.2   https://github.com/test-unit/test-unit
 rexml               3.3.8   https://github.com/ruby/rexml
 rss                 0.3.1   https://github.com/ruby/rss
 net-ftp             0.3.8   https://github.com/ruby/net-ftp
-net-imap            0.4.16  https://github.com/ruby/net-imap
+net-imap            0.4.17  https://github.com/ruby/net-imap
 net-pop             0.1.2   https://github.com/ruby/net-pop
 net-smtp            0.5.0   https://github.com/ruby/net-smtp
 matrix              0.4.2   https://github.com/ruby/matrix

From 57404e4369df11f77f089d5d11d310679b2e749f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 10 Oct 2024 20:50:48 +0200
Subject: [PATCH 037/140] [rubygems/rubygems] Fix duplicated specs when they
 have been previously activated

https://github.com/rubygems/rubygems/commit/b44bf2ac74
---
 lib/rubygems/specification_record.rb |  2 +-
 test/rubygems/test_gem.rb            | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/rubygems/specification_record.rb b/lib/rubygems/specification_record.rb
index d838fcea26912a..195a35549670ed 100644
--- a/lib/rubygems/specification_record.rb
+++ b/lib/rubygems/specification_record.rb
@@ -30,7 +30,7 @@ def initialize(dirs)
     # Returns the list of all specifications in the record
 
     def all
-      @all ||= Gem.loaded_specs.values + stubs.map(&:to_spec)
+      @all ||= stubs.map(&:to_spec)
     end
 
     ##
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 0d048b08b7f01f..cdc3479e3739d3 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1026,6 +1026,20 @@ def test_self_refresh_keeps_loaded_specs_activated
     Gem.refresh
   end
 
+  def test_activated_specs_does_not_cause_duplicates_when_looping_through_specs
+    util_make_gems
+
+    s = Gem::Specification.first
+    s.activate
+
+    Gem.refresh
+
+    assert_equal 1, Gem::Specification.count {|spec| spec.full_name == s.full_name }
+
+    Gem.loaded_specs.delete(s)
+    Gem.refresh
+  end
+
   def test_self_ruby_escaping_spaces_in_path
     with_clean_path_to_ruby do
       with_rb_config_ruby("C:/Ruby 1.8/bin/ruby.exe") do

From 48fdb9faa0a408c0855e84cfd6451393c8b67180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Tue, 8 Oct 2024 23:56:32 +0200
Subject: [PATCH 038/140] [rubygems/rubygems] Fix `gem contents` for default
 gems

A default gem does not always live in the same place. For example,
Bundler may be installed to `site_dir` when RubyGems have been upgraded.

A more reliable way seems to actually activate the default gem, so that
we can know for sure where it lives.

https://github.com/rubygems/rubygems/commit/c69f6dfb18
---
 lib/rubygems/commands/contents_command.rb     | 23 ++++++++++++-------
 .../test_gem_commands_contents_command.rb     |  6 ++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
index 807158d9c97c3e..bd0cbce8ba69f8 100644
--- a/lib/rubygems/commands/contents_command.rb
+++ b/lib/rubygems/commands/contents_command.rb
@@ -103,16 +103,23 @@ def files_in_gem(spec)
 
   def files_in_default_gem(spec)
     spec.files.map do |file|
-      case file
-      when %r{\A#{spec.bindir}/}
-        # $' is POSTMATCH
-        [RbConfig::CONFIG["bindir"], $']
-      when /\.so\z/
-        [RbConfig::CONFIG["archdir"], file]
+      if file.start_with?("#{spec.bindir}/")
+        [RbConfig::CONFIG["bindir"], file.delete_prefix("#{spec.bindir}/")]
       else
-        [RbConfig::CONFIG["rubylibdir"], file]
+        gem spec.name, spec.version
+
+        require_path = spec.require_paths.find do |path|
+          file.start_with?("#{path}/")
+        end
+
+        requirable_part = file.delete_prefix("#{require_path}/")
+
+        resolve = $LOAD_PATH.resolve_feature_path(requirable_part)&.last
+        next unless resolve
+
+        [resolve.delete_suffix(requirable_part), requirable_part]
       end
-    end
+    end.compact
   end
 
   def gem_contents(name)
diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb
index d8e6ba3dec534b..049afe8a014ad1 100644
--- a/test/rubygems/test_gem_commands_contents_command.rb
+++ b/test/rubygems/test_gem_commands_contents_command.rb
@@ -227,7 +227,6 @@ def test_execute_default_gem
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
     default_gem_spec.executables = ["default_command"]
-    default_gem_spec.files += ["default_gem.so"]
     install_default_gems(default_gem_spec)
 
     @cmd.options[:args] = %w[default]
@@ -237,9 +236,8 @@ def test_execute_default_gem
     end
 
     expected = [
-      [RbConfig::CONFIG["bindir"], "default_command"],
-      [RbConfig::CONFIG["rubylibdir"], "default/gem.rb"],
-      [RbConfig::CONFIG["archdir"], "default_gem.so"],
+      [File.join(@gemhome, "bin"), "default_command"],
+      [File.join(@tempdir, "default_gems", "lib"), "default/gem.rb"],
     ].sort.map {|a|File.join a }.join "\n"
 
     assert_equal expected, @ui.output.chomp

From 8240fe88f32ff4fec54cb6c425782597efa4d397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Mon, 14 Oct 2024 19:55:38 +0200
Subject: [PATCH 039/140] [rubygems/rubygems] Prevent some test suite warnings
 about missing extensions

We fixed some issues recently where Bundler would try to activate a
pysch spec with missing extensions and crash. However, as a side effect,
we started printing warnings about missing extensions in situations
where we did not warn before.

It may be interesting to warn on these new situations too, but in order
to minimize changes for now, I'm reverting to printing warnings in the
same situations as before.

https://github.com/rubygems/rubygems/commit/51ebff6982
---
 lib/bundler/rubygems_ext.rb         | 12 ++++++------
 lib/rubygems/basic_specification.rb | 17 ++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index 547102be41c22b..296bcfff38fccd 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -384,13 +384,13 @@ def extensions_dir
       end
     end
 
-    remove_method :ignored? if new.respond_to?(:ignored?)
+    # Can be removed once RubyGems 3.5.22 support is dropped
+    unless new.respond_to?(:ignored?)
+      def ignored?
+        return @ignored unless @ignored.nil?
 
-    # Same as RubyGems, but without warnings, because Bundler prints its own warnings
-    def ignored?
-      return @ignored unless @ignored.nil?
-
-      @ignored = missing_extensions?
+        @ignored = missing_extensions?
+      end
     end
   end
 
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
index 8c75fd41d41a57..a09e8ed0e13c81 100644
--- a/lib/rubygems/basic_specification.rb
+++ b/lib/rubygems/basic_specification.rb
@@ -71,7 +71,14 @@ def base_dir
   # Return true if this spec can require +file+.
 
   def contains_requirable_file?(file)
-    return false if ignored?
+    if ignored?
+      if platform == Gem::Platform::RUBY || Gem::Platform.local === platform
+        warn "Ignoring #{full_name} because its extensions are not built. " \
+             "Try: gem pristine #{name} --version #{version}"
+      end
+
+      return false
+    end
 
     is_soext = file.end_with?(".so", ".o")
 
@@ -89,14 +96,6 @@ def ignored?
     return @ignored unless @ignored.nil?
 
     @ignored = missing_extensions?
-    return false unless @ignored
-
-    if platform == Gem::Platform::RUBY || Gem::Platform.local === platform
-      warn "Ignoring #{full_name} because its extensions are not built. " \
-           "Try: gem pristine #{name} --version #{version}"
-    end
-
-    true
   end
 
   def default_gem?

From 6c7209cd3788ceec01e504d99057f9d3b396be84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 02:08:58 +0000
Subject: [PATCH 040/140] Bump github/codeql-action from 3.26.12 to 3.26.13

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.12 to 3.26.13.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/c36620d31ac7c881962c3d9dd939c40ec9434f2b...f779452ac5af1c261dce0346a8f964149f49322b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 8 ++++----
 .github/workflows/scorecards.yml      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 32c49518595817..f699cba2253a53 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -77,15 +77,15 @@ jobs:
         run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           languages: ${{ matrix.language }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           category: '/language:${{ matrix.language }}'
           upload: False
@@ -115,7 +115,7 @@ jobs:
         continue-on-error: true
 
       - name: Upload SARIF
-        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           sarif_file: sarif-results/${{ matrix.language }}.sarif
         continue-on-error: true
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 4dc912f3db4ecd..097f086202af3c 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           sarif_file: results.sarif

From d58ec11945a1f8bd26bb6d61a7e2c2f983350930 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Tue, 15 Oct 2024 14:52:17 +0900
Subject: [PATCH 041/140] [Bug #20797] Yet another test

---
 spec/ruby/core/time/new_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/ruby/core/time/new_spec.rb b/spec/ruby/core/time/new_spec.rb
index 9b3e4f90f3db25..fa5b5c56d60f5a 100644
--- a/spec/ruby/core/time/new_spec.rb
+++ b/spec/ruby/core/time/new_spec.rb
@@ -634,6 +634,12 @@ def obj.to_int; 3; end
         -> {
           Time.new("2020-12-25 00:56:17 +23:61")
         }.should raise_error(ArgumentError, /utc_offset/)
+
+        ruby_bug '#20797', ''...'3.4' do
+          -> {
+            Time.new("2020-12-25 00:56:17 +00:23:61")
+          }.should raise_error(ArgumentError, /utc_offset/)
+        end
       end
 
       it "raises ArgumentError if string has not ascii-compatible encoding" do

From 7eed1df1ab6b7dbf81fcff96eb0106699a140775 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Tue, 15 Oct 2024 13:35:38 +0200
Subject: [PATCH 042/140] [ruby/json] Update gemspec files

https://github.com/ruby/json/commit/0f9564104f
---
 ext/json/json.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
index 5a951a8b25db83..3ded3613d67b1a 100644
--- a/ext/json/json.gemspec
+++ b/ext/json/json.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--title", "JSON implementation for Ruby", "--main", "README.md"]
   s.files = [
     "CHANGES.md",
-    "LICENSE",
+    "COPYING",
     "README.md",
     "ext/json/ext/fbuffer/fbuffer.h",
     "ext/json/ext/generator/depend",

From 914608bed8105b23be0c77eb1b99b27b4d47e90b Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 15 Oct 2024 20:46:41 +0900
Subject: [PATCH 043/140] The part of ext/json/generator/generator.c is
 replaced from CVTUTF code.

* https://github.com/ruby/json/pull/567
* https://github.com/ruby/json/commit/c96351f874
---
 LEGAL | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/LEGAL b/LEGAL
index 162ba784836c1f..55c7ffc2917040 100644
--- a/LEGAL
+++ b/LEGAL
@@ -702,31 +702,6 @@ mentioned below.
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-[ext/json/generator/generator.c]
-
-  The file contains the following copyright notice.
-
-  >>>
-    Copyright 2001-2004:: Unicode, Inc.
-
-    Disclaimer::
-
-      This source code is provided as is by Unicode, Inc. No claims are
-      made as to fitness for any particular purpose. No warranties of any
-      kind are expressed or implied. The recipient agrees to determine
-      applicability of information provided. If this file has been
-      purchased on magnetic or optical media from Unicode, Inc., the
-      sole remedy for any claim will be exchange of defective media
-      within 90 days of receipt.
-
-    Limitations on Rights to Redistribute This Code::
-
-      Unicode, Inc. hereby grants the right to freely use the information
-      supplied in this file in the creation of products supporting the
-      Unicode Standard, and to make copies of this file in any form
-      for internal or external distribution as long as this notice
-      remains attached.
-
 [ext/psych]
 [test/psych]
 

From 48f953d6bab8cc4ef60430d5dc8058be5b2f1e37 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 15 Oct 2024 20:40:21 +0900
Subject: [PATCH 044/140] [ruby/json] Added license files on gemspec

https://github.com/ruby/json/commit/81092639e8
---
 ext/json/json.gemspec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
index 3ded3613d67b1a..c714ba86d19c87 100644
--- a/ext/json/json.gemspec
+++ b/ext/json/json.gemspec
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.files = [
     "CHANGES.md",
     "COPYING",
+    "BSDL",
+    "LEGAL",
     "README.md",
     "ext/json/ext/fbuffer/fbuffer.h",
     "ext/json/ext/generator/depend",

From 3da3cabf982eaa4d2c9732651f6a9e18ffd0aba3 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Fri, 11 Oct 2024 11:23:50 -0400
Subject: [PATCH 045/140] Remove a puts in test_finalizer_thread_raise

---
 test/ruby/test_objectspace.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb
index beb66da7e216e9..5c79983b7e87d0 100644
--- a/test/ruby/test_objectspace.rb
+++ b/test/ruby/test_objectspace.rb
@@ -208,7 +208,6 @@ def test_finalizer_thread_raise
           main_th.raise(my_error)
         end
         GC.start
-        puts "After GC"
         sleep(10)
         assert(false)
       rescue my_error

From 644153bfa8255903d0c0b7b3013bda3b33f6c706 Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Tue, 15 Oct 2024 13:33:59 -0500
Subject: [PATCH 046/140] [DOC] Tweaks for Array#shuffle! (#11891)

---
 array.rb | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/array.rb b/array.rb
index 3d64d31e95ee3e..23d38ebc655f7e 100644
--- a/array.rb
+++ b/array.rb
@@ -45,15 +45,25 @@ def each
   end
 
   # call-seq:
-  #    array.shuffle!(random: Random) -> array
+  #   shuffle!(random: Random) -> self
   #
-  # Shuffles the elements of +self+ in place.
-  #    a = [1, 2, 3] #=> [1, 2, 3]
-  #    a.shuffle!    #=> [2, 3, 1]
-  #    a             #=> [2, 3, 1]
+  # Shuffles all elements in +self+ into a random order,
+  # as selected by the object given by keyword argument +random+;
+  # returns +self+:
   #
-  # The optional +random+ argument will be used as the random number generator:
-  #    a.shuffle!(random: Random.new(1))  #=> [1, 3, 2]
+  #   a =             [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  #   a.shuffle! # => [5, 3, 8, 7, 6, 1, 9, 4, 2, 0]
+  #   a.shuffle! # => [9, 4, 0, 6, 2, 8, 1, 5, 3, 7]
+  #
+  #   Duplicate elements are included:
+  #
+  #   a =             [0, 1, 0, 1, 0, 1, 0, 1, 0, 1]
+  #   a.shuffle! # => [1, 0, 0, 1, 1, 0, 1, 0, 0, 1]
+  #   a.shuffle! # => [0, 1, 0, 1, 1, 0, 1, 0, 1, 0]
+  #
+  # The object given with keyword argument +random+ is used as the random number generator.
+  #
+  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
   def shuffle!(random: Random)
     Primitive.rb_ary_shuffle_bang(random)
   end

From f45eb3dcb9c7d849064cb802953f37e1cf9f3996 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Tue, 15 Oct 2024 12:55:05 -0400
Subject: [PATCH 047/140] Use GC.respond_to?(:compact) in
 bootstraptest/test_yjit.rb

defined?(GC.compact) will always return true even when compaction is not
supported. We should use GC.respond_to?(:compact) instead.
---
 bootstraptest/test_yjit.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb
index f0192c04142ae0..545243a0e4c6b4 100644
--- a/bootstraptest/test_yjit.rb
+++ b/bootstraptest/test_yjit.rb
@@ -123,7 +123,7 @@ def test(name, args)
 
 # regression test for GC marking stubs in invalidated code
 assert_normal_exit %q{
-  skip true unless defined?(GC.compact)
+  skip true unless GC.respond_to?(:compact)
   garbage = Array.new(10_000) { [] } # create garbage to cause iseq movement
   eval(<<~RUBY)
   def foo(n, garbage)
@@ -158,7 +158,7 @@ def call_foo = foo(0, 1, 2, 3, &->{})
 
 # regression test for invokeblock iseq guard
 assert_equal 'ok', %q{
-  skip :ok unless defined?(GC.compact)
+  skip :ok unless GC.respond_to?(:compact)
   def foo = yield
   10.times do |i|
     ret = eval("foo { #{i} }")
@@ -1230,7 +1230,7 @@ def special.[](idx)
 
 # Test that object references in generated code get marked and moved
 assert_equal "good", %q{
-  skip :good unless defined?(GC.compact)
+  skip :good unless GC.respond_to?(:compact)
   def bar
     "good"
   end
@@ -2351,7 +2351,7 @@ def foo(obj)
 
 # Test EP == BP invalidation with moving ISEQs
 assert_equal 'ok', %q{
-  skip :ok unless defined?(GC.compact)
+  skip :ok unless GC.respond_to?(:compact)
   def entry
     ok = proc { :ok } # set #entry as an EP-escaping ISEQ
     [nil].reverse_each do # avoid exiting the JIT frame on the constant

From ed993b5bcc4fcae661dd022d3211dcc770425218 Mon Sep 17 00:00:00 2001
From: Vinicius Stock <vinistock@users.noreply.github.com>
Date: Tue, 15 Oct 2024 18:59:29 -0400
Subject: [PATCH 048/140] [ruby/rdoc] Generate meta tags based on page's
 content (https://github.com/ruby/rdoc/pull/1091)

https://github.com/ruby/rdoc/commit/716bc16a7d
---
 lib/rdoc/generator/darkfish.rb                | 15 +++++++
 .../generator/template/darkfish/_head.rhtml   | 22 +++++++++
 test/rdoc/test_rdoc_generator_darkfish.rb     | 45 +++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 96bb4fb66f39f0..5709fabf810206 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -780,4 +780,19 @@ def template_for file, page = true, klass = ERB
     template
   end
 
+  # Returns an excerpt of the content for usage in meta description tags
+  def excerpt(content)
+    text = content.is_a?(RDoc::Comment) ? content.text : content
+
+    # Match from a capital letter to the first period, discarding any links, so
+    # that we don't end up matching badges in the README
+    first_paragraph_match = text.match(/[A-Z][^\.:\/]+\./)
+    return text[0...150].gsub(/\n/, " ").squeeze(" ") unless first_paragraph_match
+
+    extracted_text = first_paragraph_match[0]
+    second_paragraph = first_paragraph_match.post_match.match(/[A-Z][^\.:\/]+\./)
+    extracted_text << " " << second_paragraph[0] if second_paragraph
+
+    extracted_text[0...150].gsub(/\n/, " ").squeeze(" ")
+  end
 end
diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
index 69649ad3b53736..9e6fb4f94ca90c 100644
--- a/lib/rdoc/generator/template/darkfish/_head.rhtml
+++ b/lib/rdoc/generator/template/darkfish/_head.rhtml
@@ -3,6 +3,28 @@
 
 <title><%= h @title %></title>
 
+<%- if defined?(klass) -%>
+  <meta name="keywords" content="ruby,<%= h "#{klass.type},#{klass.full_name}" %>">
+
+  <%- if klass.comment.empty? -%>
+    <meta name="description" content="Documentation for the <%= h "#{klass.full_name} #{klass.type}" %>">
+  <%- else -%>
+    <meta name="description" content="<%= h "#{klass.type} #{klass.full_name}: #{excerpt(klass.comment)}" %>">
+  <%- end -%>
+<%- elsif defined?(file) -%>
+  <meta name="keywords" content="ruby,documentation,<%= h file.page_name %>">
+  <meta name="description" content="<%= h "#{file.page_name}: #{excerpt(file.comment)}" %>">
+<%- elsif @title -%>
+  <meta name="keywords" content="ruby,documentation,<%= h @title %>">
+
+  <%- if @options.main_page and
+      main_page = @files.find { |f| f.full_name == @options.main_page } then %>
+    <meta name="description" content="<%= h "#{@title}: #{excerpt(main_page.comment)}" %>">
+  <%- else -%>
+    <meta name="description" content="Documentation for <%= h @title %>">
+  <%- end -%>
+<%- end -%>
+
 <script type="text/javascript">
   var rdoc_rel_prefix = "<%= h asset_rel_prefix %>/";
   var index_rel_prefix = "<%= h rel_prefix %>/";
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
index 899e697de649ac..f6c0a1e1cf18aa 100644
--- a/test/rdoc/test_rdoc_generator_darkfish.rb
+++ b/test/rdoc/test_rdoc_generator_darkfish.rb
@@ -322,6 +322,51 @@ def test_title_escape
     assert_main_title(File.binread('index.html'), title)
   end
 
+  def test_meta_tags_for_index
+    @options.title = "My awesome Ruby project"
+    @g.generate
+
+    content = File.binread("index.html")
+
+    assert_include(content, '<meta name="keywords" content="ruby,documentation,My awesome Ruby project">')
+    assert_include(content, '<meta name="description" content="Documentation for My awesome Ruby project">')
+  end
+
+  def test_meta_tags_for_classes
+    top_level = @store.add_file("file.rb")
+    top_level.add_class(@klass.class, @klass.name)
+    inner = @klass.add_class(RDoc::NormalClass, "Inner")
+    inner.add_comment("This is a normal class. It is fully documented.", top_level)
+
+    @g.generate
+
+    content = File.binread("Klass/Inner.html")
+    assert_include(content, '<meta name="keywords" content="ruby,class,Klass::Inner">')
+    assert_include(
+      content,
+      '<meta name="description" content="class Klass::Inner: This is a normal class. It is fully documented.">',
+    )
+  end
+
+  def test_meta_tags_for_pages
+    top_level = @store.add_file("CONTRIBUTING.rdoc", parser: RDoc::Parser::Simple)
+    top_level.comment = <<~RDOC
+      = Contributing
+
+      Here are the instructions for contributing. Begin by installing Ruby.
+    RDOC
+
+    @g.generate
+
+    content = File.binread("CONTRIBUTING_rdoc.html")
+    assert_include(content, '<meta name="keywords" content="ruby,documentation,CONTRIBUTING">')
+    assert_include(
+      content,
+      "<meta name=\"description\" content=\"CONTRIBUTING: Contributing Here are the instructions for contributing." \
+      " Begin by installing Ruby.\">",
+    )
+  end
+
   ##
   # Asserts that +filename+ has a link count greater than 1 if hard links to
   # @tmpdir are supported.

From a0ecdbfbfe57a57ab33bdb5e1de4d5dfa8407dbb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <tenderlove@ruby-lang.org>
Date: Tue, 15 Oct 2024 16:57:09 -0700
Subject: [PATCH 049/140] Remove "simple" flag from forwarded ICs

I don't think we should ever consider forwarded IC's to be "simple".
Previously, the "simple" flag would be copied to the derived IC and this
happened to cause struct set / get iseqs to write an invalid CC
fastpath:

  https://github.com/tenderlove/ruby/blob/f45eb3dcb9c7d849064cb802953f37e1cf9f3996/vm_insnhelper.c#L4726-L4729

[Bug #20799]
---
 bootstraptest/test_method.rb | 21 +++++++++++++++++++++
 vm_args.c                    |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
index af9443b8c6f5b8..f6f04541d6be09 100644
--- a/bootstraptest/test_method.rb
+++ b/bootstraptest/test_method.rb
@@ -1374,3 +1374,24 @@ def foo(...)
   foo(:foo, b: :ok)
   foo(*["foo"], b: :ok)
 }
+
+assert_equal 'ok', %q{
+  Thing = Struct.new(:value)
+
+  Obj = Thing.new("ok")
+
+  def delegate(...)
+    Obj.value(...)
+  end
+
+  def no_args
+    delegate
+  end
+
+  def splat_args(*args)
+    delegate(*args)
+  end
+
+  no_args
+  splat_args
+}
diff --git a/vm_args.c b/vm_args.c
index 0ecdc31a316d21..28f685d7dd53bd 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -1177,7 +1177,7 @@ vm_caller_setup_fwd_args(const rb_execution_context_t *ec, rb_control_frame_t *r
 
     *adjusted_ci = VM_CI_ON_STACK(
             site_mid,
-            (caller_flag | (site_flag & (VM_CALL_FCALL | VM_CALL_FORWARDING))),
+            ((caller_flag & ~VM_CALL_ARGS_SIMPLE) | (site_flag & (VM_CALL_FCALL | VM_CALL_FORWARDING))),
             site_argc + caller_argc,
             kw
             );

From bbd5b8ddae7b3ff7205866d54cf8aca065a6d9bd Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 11 Oct 2024 14:59:09 +0900
Subject: [PATCH 050/140] [ruby/fiddle] Ractor support
 (https://github.com/ruby/fiddle/pull/139)

https://github.com/ruby/fiddle/commit/91d0ea9849

Co-authored-by: Sutou Kouhei <kou@clear-code.com>
---
 ext/fiddle/closure.c            |  3 ++-
 ext/fiddle/extconf.rb           |  2 ++
 ext/fiddle/fiddle.h             | 10 ++++++++++
 ext/fiddle/function.c           |  5 ++++-
 ext/fiddle/handle.c             |  3 ++-
 ext/fiddle/memory_view.c        |  9 +++++++--
 ext/fiddle/pinned.c             | 10 +++++++---
 ext/fiddle/pointer.c            |  2 +-
 test/fiddle/helper.rb           |  5 +++++
 test/fiddle/test_closure.rb     | 12 ++++++++++++
 test/fiddle/test_function.rb    |  5 +++++
 test/fiddle/test_handle.rb      |  5 +++++
 test/fiddle/test_memory_view.rb | 12 ++++++++++++
 test/fiddle/test_pinned.rb      |  8 +++++++-
 test/fiddle/test_pointer.rb     |  8 ++++++++
 15 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index 7aa9407619c71b..d526d870e85e7f 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -61,7 +61,7 @@ const rb_data_type_t closure_data_type = {
         .dfree = dealloc,
         .dsize = closure_memsize
     },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    .flags = FIDDLE_DEFAULT_TYPED_DATA_FLAGS,
 };
 
 struct callback_args {
@@ -300,6 +300,7 @@ initialize_body(VALUE user_data)
         cl->argv[i] = rb_fiddle_int_to_ffi_type(NUM2INT(arg));
     }
     cl->argv[argc] = NULL;
+    OBJ_FREEZE_RAW(normalized_args);
 
     ret = rb_fiddle_type_ensure(ret);
     rb_iv_set(data->self, "@ctype", ret);
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 6b0ea753fc373b..f062d1fc768635 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -223,6 +223,8 @@ def enable_debug_build_flag(flags)
   $LOCAL_LIBS.prepend("#{libffi.a} ").strip! # to exts.mk
   $INCFLAGS.gsub!(/-I#{libffi.dir}/, '-I$(LIBFFI_DIR)')
 end
+
+have_func("rb_str_to_interned_str")
 create_makefile 'fiddle' do |conf|
   if !libffi
     next conf << "LIBFFI_CLEAN = none\n"
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
index 54391b95f57073..c0ab8a91ec2fa2 100644
--- a/ext/fiddle/fiddle.h
+++ b/ext/fiddle/fiddle.h
@@ -236,4 +236,14 @@ VALUE rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type);
 typedef void (*rb_fiddle_freefunc_t)(void*);
 VALUE rb_fiddle_ptr_new_wrap(void *ptr, long size, rb_fiddle_freefunc_t func, VALUE wrap0, VALUE wrap1);
 
+enum {
+    FIDDLE_DEFAULT_TYPED_DATA_FLAGS = (
+        RUBY_TYPED_FREE_IMMEDIATELY |
+        RUBY_TYPED_WB_PROTECTED |
+#ifdef RUBY_TYPED_FROZEN_SHAREABLE
+        RUBY_TYPED_FROZEN_SHAREABLE |
+#endif
+        0)
+};
+
 #endif
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index 73dfb129a54d3f..21a7ad6d2342d3 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -59,7 +59,7 @@ const rb_data_type_t function_data_type = {
         .dfree = deallocate,
         .dsize = function_memsize
     },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    .flags = FIDDLE_DEFAULT_TYPED_DATA_FLAGS,
 };
 
 static VALUE
@@ -153,6 +153,9 @@ initialize(int argc, VALUE argv[], VALUE self)
         rb_get_kwargs(kwargs, kw, 0, kw_max_, args);
         if (args[kw_name] != Qundef) {
             name = args[kw_name];
+#ifdef HAVE_RB_STR_TO_INTERNED_STR
+            name = rb_str_to_interned_str(name);
+#endif
         }
         if (args[kw_need_gvl] != Qundef) {
             need_gvl = args[kw_need_gvl];
diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c
index 558d6d45516641..0d03133cabe755 100644
--- a/ext/fiddle/handle.c
+++ b/ext/fiddle/handle.c
@@ -56,7 +56,8 @@ static const rb_data_type_t fiddle_handle_data_type = {
         .dfree = fiddle_handle_free,
         .dsize = fiddle_handle_memsize
     },
-    .flags = RUBY_TYPED_WB_PROTECTED,
+    .flags = FIDDLE_DEFAULT_TYPED_DATA_FLAGS & ~RUBY_TYPED_FREE_IMMEDIATELY,
+    /* keeping while its symbols are referred. */
 };
 
 /*
diff --git a/ext/fiddle/memory_view.c b/ext/fiddle/memory_view.c
index fa66fc2c7b26d1..5fd7b9b408fe25 100644
--- a/ext/fiddle/memory_view.c
+++ b/ext/fiddle/memory_view.c
@@ -64,8 +64,13 @@ fiddle_memview_memsize(const void *ptr)
 }
 
 static const rb_data_type_t fiddle_memview_data_type = {
-    "fiddle/memory_view",
-    {fiddle_memview_mark, fiddle_memview_free, fiddle_memview_memsize,},
+    .wrap_struct_name = "fiddle/memory_view",
+    .function = {
+        .dmark = fiddle_memview_mark,
+        .dfree = fiddle_memview_free,
+        .dsize = fiddle_memview_memsize,
+    },
+    .flags = FIDDLE_DEFAULT_TYPED_DATA_FLAGS,
 };
 
 static VALUE
diff --git a/ext/fiddle/pinned.c b/ext/fiddle/pinned.c
index 019a3020e2647e..94962b0ff6a9ed 100644
--- a/ext/fiddle/pinned.c
+++ b/ext/fiddle/pinned.c
@@ -24,9 +24,13 @@ pinned_memsize(const void *ptr)
 }
 
 static const rb_data_type_t pinned_data_type = {
-    "fiddle/pinned",
-    {pinned_mark, xfree, pinned_memsize, },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+    .wrap_struct_name = "fiddle/pinned",
+    .function = {
+        .dmark = pinned_mark,
+        .dfree = RUBY_TYPED_DEFAULT_FREE,
+        .dsize = pinned_memsize,
+    },
+    .flags = FIDDLE_DEFAULT_TYPED_DATA_FLAGS,
 };
 
 static VALUE
diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c
index 5c375fe9d2f08c..00bd76e9b2f107 100644
--- a/ext/fiddle/pointer.c
+++ b/ext/fiddle/pointer.c
@@ -94,7 +94,7 @@ static const rb_data_type_t fiddle_ptr_data_type = {
         .dfree = fiddle_ptr_free,
         .dsize = fiddle_ptr_memsize,
     },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+    .flags = FIDDLE_DEFAULT_TYPED_DATA_FLAGS,
 };
 
 #ifdef HAVE_RUBY_MEMORY_VIEW_H
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index 9dfe381a201e17..aebe028206ae4e 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -189,5 +189,10 @@ def under_gc_stress
     ensure
       GC.stress = stress
     end
+
+    def assert_ractor_shareable(object)
+      Ractor.make_shareable(object)
+      assert_operator(Ractor, :shareable?, object)
+    end
   end
 end
diff --git a/test/fiddle/test_closure.rb b/test/fiddle/test_closure.rb
index 787a9b635a37a4..3985e1e2bf07f3 100644
--- a/test/fiddle/test_closure.rb
+++ b/test/fiddle/test_closure.rb
@@ -152,5 +152,17 @@ def test_memsize_ruby_dev_42480
         end
       end
     end
+
+    def test_ractor_shareable
+      omit("Need Ractor") unless defined?(Ractor)
+      closure_class = Class.new(Closure) do
+        def call
+          0
+        end
+      end
+      closure_class.create(:int, [:void]) do |c|
+        assert_ractor_shareable(c)
+      end
+    end
   end
 end if defined?(Fiddle)
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
index b6ae8c14bcb514..b4b2df2874f639 100644
--- a/test/fiddle/test_function.rb
+++ b/test/fiddle/test_function.rb
@@ -253,6 +253,11 @@ def test_no_memory_leak
       end
     end
 
+    def test_ractor_shareable
+      omit("Need Ractor") unless defined?(Ractor)
+      assert_ractor_shareable(Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE))
+    end
+
     private
 
     def perror(m)
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
index c952a7ef17f80c..2a51add8523444 100644
--- a/test/fiddle/test_handle.rb
+++ b/test/fiddle/test_handle.rb
@@ -226,5 +226,10 @@ def test_fallback_to_ansi
         assert_equal(ansi, k["GetFileAttributes"], "should fallback to ANSI version")
       end
     end
+
+    def test_ractor_shareable
+      omit("Need Ractor") unless defined?(Ractor)
+      assert_ractor_shareable(Fiddle::Handle.new(LIBC_SO))
+    end
   end
 end if defined?(Fiddle)
diff --git a/test/fiddle/test_memory_view.rb b/test/fiddle/test_memory_view.rb
index d44c42d2394528..da00d66c91b2b4 100644
--- a/test/fiddle/test_memory_view.rb
+++ b/test/fiddle/test_memory_view.rb
@@ -159,5 +159,17 @@ def test_to_s
         mview.release
       end
     end
+
+    def test_ractor_shareable
+      omit("Need Ractor") unless defined?(Ractor)
+      ptr = Pointer["hello world"]
+      mview = MemoryView.new(ptr)
+      begin
+        assert_ractor_shareable(mview)
+        assert_predicate(ptr, :frozen?)
+      ensure
+        mview.release
+      end
+    end
   end
 end
diff --git a/test/fiddle/test_pinned.rb b/test/fiddle/test_pinned.rb
index f0d375b1cc5895..ad132579b00a05 100644
--- a/test/fiddle/test_pinned.rb
+++ b/test/fiddle/test_pinned.rb
@@ -23,6 +23,12 @@ def test_clear
       end
       assert_match "called on", ex.message
     end
+
+    def test_ractor_shareable
+      omit("Need Ractor") unless defined?(Ractor)
+      obj = Object.new
+      assert_ractor_shareable(Pinned.new(obj))
+      assert_predicate(obj, :frozen?)
+    end
   end
 end
-
diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb
index f17c8338f5e6cc..ea8015438ef1f5 100644
--- a/test/fiddle/test_pointer.rb
+++ b/test/fiddle/test_pointer.rb
@@ -305,5 +305,13 @@ def test_null_pointer
       assert_raise(DLError) {nullpo[0]}
       assert_raise(DLError) {nullpo[0] = 1}
     end
+
+    def test_ractor_shareable
+      omit("Need Ractor") unless defined?(Ractor)
+      assert_ractor_shareable(Fiddle::NULL)
+      ary = [0, 1, 2, 4, 5]
+      addr = Pointer.new(dlwrap(ary))
+      assert_ractor_shareable(addr)
+    end
   end
 end if defined?(Fiddle)

From 8d127c9b592c58c858a57af6a4a0d805491b5d2b Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Thu, 10 Oct 2024 14:37:12 +0900
Subject: [PATCH 051/140] Use JRuby implementation for TruffleRuby (#149)

Fix GH-145

Rename `lib/fiddle/jruby.rb` to `lib/fiddle/ffi_backend.rb` as a generic
ffi gem API based implementation.
JRuby and TruffleRuby use `lib/fiddle/ffi_backend.rb`.

---------

Co-authored-by: Benoit Daloze <eregontp@gmail.com>
---
 ext/fiddle/extconf.rb                         |   2 +-
 ext/fiddle/fiddle.gemspec                     |   3 +-
 ext/fiddle/lib/fiddle.rb                      |   6 +-
 .../lib/fiddle/{jruby.rb => ffi_backend.rb}   | 145 ++++++++++--------
 ext/fiddle/lib/fiddle/ruby.rb                 |   1 -
 test/fiddle/helper.rb                         |   4 +
 test/fiddle/test_closure.rb                   |  11 +-
 test/fiddle/test_fiddle.rb                    |  12 +-
 test/fiddle/test_func.rb                      |  27 ++--
 test/fiddle/test_function.rb                  |  10 +-
 test/fiddle/test_handle.rb                    |  20 +--
 test/fiddle/test_import.rb                    |   4 +-
 test/fiddle/test_pointer.rb                   |  20 +--
 13 files changed, 156 insertions(+), 109 deletions(-)
 rename ext/fiddle/lib/fiddle/{jruby.rb => ffi_backend.rb} (72%)
 delete mode 100644 ext/fiddle/lib/fiddle/ruby.rb

diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index f062d1fc768635..28999806579744 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'mkmf'
 
-if RUBY_ENGINE == "jruby"
+unless RUBY_ENGINE == "ruby"
   File.write('Makefile', dummy_makefile("").join)
   return
 end
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
index 65de7a30af95fd..0092f5200337fa 100644
--- a/ext/fiddle/fiddle.gemspec
+++ b/ext/fiddle/fiddle.gemspec
@@ -38,11 +38,10 @@ Gem::Specification.new do |spec|
     "lib/fiddle.rb",
     "lib/fiddle/closure.rb",
     "lib/fiddle/cparser.rb",
+    "lib/fiddle/ffi_backend.rb",
     "lib/fiddle/function.rb",
     "lib/fiddle/import.rb",
-    "lib/fiddle/jruby.rb",
     "lib/fiddle/pack.rb",
-    "lib/fiddle/ruby.rb",
     "lib/fiddle/struct.rb",
     "lib/fiddle/types.rb",
     "lib/fiddle/value.rb",
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
index b1c6cd08bf6c41..6718b012efee5b 100644
--- a/ext/fiddle/lib/fiddle.rb
+++ b/ext/fiddle/lib/fiddle.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-require "fiddle/#{RUBY_ENGINE}"
+if RUBY_ENGINE == 'ruby'
+  require 'fiddle.so'
+else
+  require 'fiddle/ffi_backend'
+end
 require 'fiddle/closure'
 require 'fiddle/function'
 require 'fiddle/version'
diff --git a/ext/fiddle/lib/fiddle/jruby.rb b/ext/fiddle/lib/fiddle/ffi_backend.rb
similarity index 72%
rename from ext/fiddle/lib/fiddle/jruby.rb
rename to ext/fiddle/lib/fiddle/ffi_backend.rb
index 9ad61d4d9d1d5b..0c7c379777fad6 100644
--- a/ext/fiddle/lib/fiddle/jruby.rb
+++ b/ext/fiddle/lib/fiddle/ffi_backend.rb
@@ -1,4 +1,4 @@
-# This is part of JRuby's FFI-based fiddle implementation.
+# This is based on JRuby's FFI-based fiddle implementation.
 
 require 'ffi'
 
@@ -74,7 +74,7 @@ module Types
 
   WINDOWS = FFI::Platform.windows?
 
-  module JRuby
+  module FFIBackend
     FFITypes = {
         'c' => FFI::Type::INT8,
         'h' => FFI::Type::INT16,
@@ -104,16 +104,16 @@ module JRuby
         Types::VARIADIC => FFI::Type::Builtin::VARARGS,
     }
 
-    def self.__ffi_type__(dl_type)
-      if dl_type.is_a?(Symbol)
-        dl_type = Types.const_get(dl_type.to_s.upcase)
+    def self.to_ffi_type(fiddle_type)
+      if fiddle_type.is_a?(Symbol)
+        fiddle_type = Types.const_get(fiddle_type.to_s.upcase)
       end
-      if !dl_type.is_a?(Integer) && dl_type.respond_to?(:to_int)
-        dl_type = dl_type.to_int
+      if !fiddle_type.is_a?(Integer) && fiddle_type.respond_to?(:to_int)
+        fiddle_type = fiddle_type.to_int
       end
-      ffi_type = FFITypes[dl_type]
-      ffi_type = FFITypes[-dl_type] if ffi_type.nil? && dl_type.is_a?(Integer) && dl_type < 0
-      raise TypeError.new("cannot convert #{dl_type} to ffi") unless ffi_type
+      ffi_type = FFITypes[fiddle_type]
+      ffi_type = FFITypes[-fiddle_type] if ffi_type.nil? && fiddle_type.is_a?(Integer) && fiddle_type < 0
+      raise TypeError.new("cannot convert #{fiddle_type} to ffi") unless ffi_type
       ffi_type
     end
   end
@@ -133,8 +133,8 @@ def initialize(ptr, args, return_type, abi = DEFAULT, kwargs = nil)
       @ptr, @args, @return_type, @abi = ptr, args, return_type, abi
       raise TypeError.new "invalid argument types" unless args.is_a?(Array)
 
-      ffi_return_type = Fiddle::JRuby::__ffi_type__(@return_type)
-      ffi_args = @args.map { |t| Fiddle::JRuby.__ffi_type__(t) }
+      ffi_return_type = Fiddle::FFIBackend.to_ffi_type(@return_type)
+      ffi_args = @args.map { |t| Fiddle::FFIBackend.to_ffi_type(t) }
       pointer = FFI::Pointer.new(ptr.to_i)
       options = {convention: @abi}
       if ffi_args.last == FFI::Type::Builtin::VARARGS
@@ -149,14 +149,25 @@ def initialize(ptr, args, return_type, abi = DEFAULT, kwargs = nil)
       end
     end
 
-    def call(*args, &block);
+    def call(*args, &block)
       if @function.is_a?(FFI::VariadicInvoker)
         n_fixed_args = @args.size - 1
         n_fixed_args.step(args.size - 1, 2) do |i|
           if args[i] == :const_string || args[i] == Types::CONST_STRING
             args[i + 1] = String.try_convert(args[i + 1]) || args[i + 1]
           end
-          args[i] = Fiddle::JRuby.__ffi_type__(args[i])
+          args[i] = Fiddle::FFIBackend.to_ffi_type(args[i])
+        end
+      else
+        args.map! do |arg|
+          if arg.respond_to?(:to_ptr)
+            begin
+              arg = arg.to_ptr
+            end until arg.is_a?(FFI::Pointer) || !arg.respond_to?(:to_ptr)
+            arg
+          else
+            arg
+          end
         end
       end
       result = @function.call(*args, &block)
@@ -170,19 +181,21 @@ def initialize(ret, args, abi = Function::DEFAULT)
       raise TypeError.new "invalid argument types" unless args.is_a?(Array)
 
       @ctype, @args = ret, args
-      ffi_args = @args.map { |t| Fiddle::JRuby.__ffi_type__(t) }
+      ffi_args = @args.map { |t| Fiddle::FFIBackend.to_ffi_type(t) }
       if ffi_args.size == 1 && ffi_args[0] == FFI::Type::Builtin::VOID
         ffi_args = []
       end
-      @function = FFI::Function.new(
-        Fiddle::JRuby.__ffi_type__(@ctype),
-        ffi_args,
-        self,
-        :convention => abi
-      )
+      return_type = Fiddle::FFIBackend.to_ffi_type(@ctype)
+      raise "#{self.class} must implement #call" unless respond_to?(:call)
+      callable = method(:call)
+      @function = FFI::Function.new(return_type, ffi_args, callable, convention: abi)
       @freed = false
     end
 
+    def to_ptr
+      @function
+    end
+
     def to_i
       @function.to_i
     end
@@ -550,51 +563,51 @@ def cleared?
   RUBY_FREE = Fiddle::Pointer::LibC::FREE.address
   NULL = Fiddle::Pointer.new(0)
 
-  ALIGN_VOIDP       = Fiddle::JRuby::FFITypes[Types::VOIDP].alignment
-  ALIGN_CHAR        = Fiddle::JRuby::FFITypes[Types::CHAR].alignment
-  ALIGN_SHORT       = Fiddle::JRuby::FFITypes[Types::SHORT].alignment
-  ALIGN_INT         = Fiddle::JRuby::FFITypes[Types::INT].alignment
-  ALIGN_LONG        = Fiddle::JRuby::FFITypes[Types::LONG].alignment
-  ALIGN_LONG_LONG   = Fiddle::JRuby::FFITypes[Types::LONG_LONG].alignment
-  ALIGN_INT8_T      = Fiddle::JRuby::FFITypes[Types::INT8_T].alignment
-  ALIGN_INT16_T     = Fiddle::JRuby::FFITypes[Types::INT16_T].alignment
-  ALIGN_INT32_T     = Fiddle::JRuby::FFITypes[Types::INT32_T].alignment
-  ALIGN_INT64_T     = Fiddle::JRuby::FFITypes[Types::INT64_T].alignment
-  ALIGN_FLOAT       = Fiddle::JRuby::FFITypes[Types::FLOAT].alignment
-  ALIGN_DOUBLE      = Fiddle::JRuby::FFITypes[Types::DOUBLE].alignment
-  ALIGN_BOOL        = Fiddle::JRuby::FFITypes[Types::BOOL].alignment
-  ALIGN_SIZE_T      = Fiddle::JRuby::FFITypes[Types::SIZE_T].alignment
+  ALIGN_VOIDP       = Fiddle::FFIBackend::FFITypes[Types::VOIDP].alignment
+  ALIGN_CHAR        = Fiddle::FFIBackend::FFITypes[Types::CHAR].alignment
+  ALIGN_SHORT       = Fiddle::FFIBackend::FFITypes[Types::SHORT].alignment
+  ALIGN_INT         = Fiddle::FFIBackend::FFITypes[Types::INT].alignment
+  ALIGN_LONG        = Fiddle::FFIBackend::FFITypes[Types::LONG].alignment
+  ALIGN_LONG_LONG   = Fiddle::FFIBackend::FFITypes[Types::LONG_LONG].alignment
+  ALIGN_INT8_T      = Fiddle::FFIBackend::FFITypes[Types::INT8_T].alignment
+  ALIGN_INT16_T     = Fiddle::FFIBackend::FFITypes[Types::INT16_T].alignment
+  ALIGN_INT32_T     = Fiddle::FFIBackend::FFITypes[Types::INT32_T].alignment
+  ALIGN_INT64_T     = Fiddle::FFIBackend::FFITypes[Types::INT64_T].alignment
+  ALIGN_FLOAT       = Fiddle::FFIBackend::FFITypes[Types::FLOAT].alignment
+  ALIGN_DOUBLE      = Fiddle::FFIBackend::FFITypes[Types::DOUBLE].alignment
+  ALIGN_BOOL        = Fiddle::FFIBackend::FFITypes[Types::BOOL].alignment
+  ALIGN_SIZE_T      = Fiddle::FFIBackend::FFITypes[Types::SIZE_T].alignment
   ALIGN_SSIZE_T     = ALIGN_SIZE_T
-  ALIGN_PTRDIFF_T   = Fiddle::JRuby::FFITypes[Types::PTRDIFF_T].alignment
-  ALIGN_INTPTR_T    = Fiddle::JRuby::FFITypes[Types::INTPTR_T].alignment
-  ALIGN_UINTPTR_T   = Fiddle::JRuby::FFITypes[Types::UINTPTR_T].alignment
-
-  SIZEOF_VOIDP       = Fiddle::JRuby::FFITypes[Types::VOIDP].size
-  SIZEOF_CHAR        = Fiddle::JRuby::FFITypes[Types::CHAR].size
-  SIZEOF_UCHAR       = Fiddle::JRuby::FFITypes[Types::UCHAR].size
-  SIZEOF_SHORT       = Fiddle::JRuby::FFITypes[Types::SHORT].size
-  SIZEOF_USHORT      = Fiddle::JRuby::FFITypes[Types::USHORT].size
-  SIZEOF_INT         = Fiddle::JRuby::FFITypes[Types::INT].size
-  SIZEOF_UINT        = Fiddle::JRuby::FFITypes[Types::UINT].size
-  SIZEOF_LONG        = Fiddle::JRuby::FFITypes[Types::LONG].size
-  SIZEOF_ULONG       = Fiddle::JRuby::FFITypes[Types::ULONG].size
-  SIZEOF_LONG_LONG   = Fiddle::JRuby::FFITypes[Types::LONG_LONG].size
-  SIZEOF_ULONG_LONG  = Fiddle::JRuby::FFITypes[Types::ULONG_LONG].size
-  SIZEOF_INT8_T      = Fiddle::JRuby::FFITypes[Types::INT8_T].size
-  SIZEOF_UINT8_T     = Fiddle::JRuby::FFITypes[Types::UINT8_T].size
-  SIZEOF_INT16_T     = Fiddle::JRuby::FFITypes[Types::INT16_T].size
-  SIZEOF_UINT16_T    = Fiddle::JRuby::FFITypes[Types::UINT16_T].size
-  SIZEOF_INT32_T     = Fiddle::JRuby::FFITypes[Types::INT32_T].size
-  SIZEOF_UINT32_T    = Fiddle::JRuby::FFITypes[Types::UINT32_T].size
-  SIZEOF_INT64_T     = Fiddle::JRuby::FFITypes[Types::INT64_T].size
-  SIZEOF_UINT64_T    = Fiddle::JRuby::FFITypes[Types::UINT64_T].size
-  SIZEOF_FLOAT       = Fiddle::JRuby::FFITypes[Types::FLOAT].size
-  SIZEOF_DOUBLE      = Fiddle::JRuby::FFITypes[Types::DOUBLE].size
-  SIZEOF_BOOL        = Fiddle::JRuby::FFITypes[Types::BOOL].size
-  SIZEOF_SIZE_T      = Fiddle::JRuby::FFITypes[Types::SIZE_T].size
+  ALIGN_PTRDIFF_T   = Fiddle::FFIBackend::FFITypes[Types::PTRDIFF_T].alignment
+  ALIGN_INTPTR_T    = Fiddle::FFIBackend::FFITypes[Types::INTPTR_T].alignment
+  ALIGN_UINTPTR_T   = Fiddle::FFIBackend::FFITypes[Types::UINTPTR_T].alignment
+
+  SIZEOF_VOIDP       = Fiddle::FFIBackend::FFITypes[Types::VOIDP].size
+  SIZEOF_CHAR        = Fiddle::FFIBackend::FFITypes[Types::CHAR].size
+  SIZEOF_UCHAR       = Fiddle::FFIBackend::FFITypes[Types::UCHAR].size
+  SIZEOF_SHORT       = Fiddle::FFIBackend::FFITypes[Types::SHORT].size
+  SIZEOF_USHORT      = Fiddle::FFIBackend::FFITypes[Types::USHORT].size
+  SIZEOF_INT         = Fiddle::FFIBackend::FFITypes[Types::INT].size
+  SIZEOF_UINT        = Fiddle::FFIBackend::FFITypes[Types::UINT].size
+  SIZEOF_LONG        = Fiddle::FFIBackend::FFITypes[Types::LONG].size
+  SIZEOF_ULONG       = Fiddle::FFIBackend::FFITypes[Types::ULONG].size
+  SIZEOF_LONG_LONG   = Fiddle::FFIBackend::FFITypes[Types::LONG_LONG].size
+  SIZEOF_ULONG_LONG  = Fiddle::FFIBackend::FFITypes[Types::ULONG_LONG].size
+  SIZEOF_INT8_T      = Fiddle::FFIBackend::FFITypes[Types::INT8_T].size
+  SIZEOF_UINT8_T     = Fiddle::FFIBackend::FFITypes[Types::UINT8_T].size
+  SIZEOF_INT16_T     = Fiddle::FFIBackend::FFITypes[Types::INT16_T].size
+  SIZEOF_UINT16_T    = Fiddle::FFIBackend::FFITypes[Types::UINT16_T].size
+  SIZEOF_INT32_T     = Fiddle::FFIBackend::FFITypes[Types::INT32_T].size
+  SIZEOF_UINT32_T    = Fiddle::FFIBackend::FFITypes[Types::UINT32_T].size
+  SIZEOF_INT64_T     = Fiddle::FFIBackend::FFITypes[Types::INT64_T].size
+  SIZEOF_UINT64_T    = Fiddle::FFIBackend::FFITypes[Types::UINT64_T].size
+  SIZEOF_FLOAT       = Fiddle::FFIBackend::FFITypes[Types::FLOAT].size
+  SIZEOF_DOUBLE      = Fiddle::FFIBackend::FFITypes[Types::DOUBLE].size
+  SIZEOF_BOOL        = Fiddle::FFIBackend::FFITypes[Types::BOOL].size
+  SIZEOF_SIZE_T      = Fiddle::FFIBackend::FFITypes[Types::SIZE_T].size
   SIZEOF_SSIZE_T     = SIZEOF_SIZE_T
-  SIZEOF_PTRDIFF_T   = Fiddle::JRuby::FFITypes[Types::PTRDIFF_T].size
-  SIZEOF_INTPTR_T    = Fiddle::JRuby::FFITypes[Types::INTPTR_T].size
-  SIZEOF_UINTPTR_T   = Fiddle::JRuby::FFITypes[Types::UINTPTR_T].size
-  SIZEOF_CONST_STRING = Fiddle::JRuby::FFITypes[Types::VOIDP].size
+  SIZEOF_PTRDIFF_T   = Fiddle::FFIBackend::FFITypes[Types::PTRDIFF_T].size
+  SIZEOF_INTPTR_T    = Fiddle::FFIBackend::FFITypes[Types::INTPTR_T].size
+  SIZEOF_UINTPTR_T   = Fiddle::FFIBackend::FFITypes[Types::UINTPTR_T].size
+  SIZEOF_CONST_STRING = Fiddle::FFIBackend::FFITypes[Types::VOIDP].size
 end
diff --git a/ext/fiddle/lib/fiddle/ruby.rb b/ext/fiddle/lib/fiddle/ruby.rb
deleted file mode 100644
index ee5a9a937979c6..00000000000000
--- a/ext/fiddle/lib/fiddle/ruby.rb
+++ /dev/null
@@ -1 +0,0 @@
-require "fiddle.so"
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index aebe028206ae4e..457e02f59514a8 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -183,6 +183,10 @@ def teardown
       end
     end
 
+    def ffi_backend?
+      RUBY_ENGINE != 'ruby'
+    end
+
     def under_gc_stress
       stress, GC.stress = GC.stress, true
       yield
diff --git a/test/fiddle/test_closure.rb b/test/fiddle/test_closure.rb
index 3985e1e2bf07f3..26cff8e516b319 100644
--- a/test/fiddle/test_closure.rb
+++ b/test/fiddle/test_closure.rb
@@ -58,9 +58,9 @@ def call thing
     end
 
     def test_const_string
-      if RUBY_ENGINE == "jruby"
+      if ffi_backend?
         omit("Closure with :const_string works but " +
-             "Function with :const_string doesn't work with JRuby")
+             "Function with :const_string doesn't work with FFI backend")
       end
 
       closure_class = Class.new(Closure) do
@@ -119,9 +119,14 @@ def test_memsize_ruby_dev_42480
       end
 
       require 'objspace'
+      closure_class = Class.new(Closure) do
+        def call
+          10
+        end
+      end
       n = 10000
       n.times do
-        Closure.create(:int, [:void]) do |closure|
+        closure_class.create(:int, [:void]) do |closure|
           ObjectSpace.memsize_of(closure)
         end
       end
diff --git a/test/fiddle/test_fiddle.rb b/test/fiddle/test_fiddle.rb
index b247ae15cb9c84..28ae922171bb52 100644
--- a/test/fiddle/test_fiddle.rb
+++ b/test/fiddle/test_fiddle.rb
@@ -6,8 +6,8 @@
 
 class TestFiddle < Fiddle::TestCase
   def test_nil_true_etc
-    if RUBY_ENGINE == "jruby"
-      omit("Fiddle::Q* aren't supported with JRuby")
+    if ffi_backend?
+      omit("Fiddle::Q* aren't supported with FFI backend")
     end
 
     assert_equal Fiddle::Qtrue, Fiddle.dlwrap(true)
@@ -30,6 +30,10 @@ def test_dlopen_linker_script_input_linux
     if Dir.glob("/usr/lib/*/libncurses.so").empty?
       omit("libncurses.so is needed")
     end
+    if ffi_backend?
+      omit("Fiddle::Handle#file_name doesn't exist in FFI backend")
+    end
+
     # libncurses.so uses INPUT() on Debian GNU/Linux
     # $ cat /usr/lib/x86_64-linux-gnu/libncurses.so
     # INPUT(libncurses.so.6 -ltinfo)
@@ -44,6 +48,10 @@ def test_dlopen_linker_script_input_linux
 
   def test_dlopen_linker_script_group_linux
     omit("This is only for Linux") unless RUBY_PLATFORM.match?("linux")
+    if ffi_backend?
+      omit("Fiddle::Handle#file_name doesn't exist in FFI backend")
+    end
+
     # libc.so uses GROUP() on Debian GNU/Linux
     # $ cat /usr/lib/x86_64-linux-gnu/libc.so
     # /* GNU ld script
diff --git a/test/fiddle/test_func.rb b/test/fiddle/test_func.rb
index 5d69cc5f11ad3d..ca503f92ad8c46 100644
--- a/test/fiddle/test_func.rb
+++ b/test/fiddle/test_func.rb
@@ -64,6 +64,10 @@ def test_strtod
     end
 
     def test_qsort1
+      if RUBY_ENGINE == "jruby"
+        omit("The untouched sanity check is broken on JRuby: https://github.com/jruby/jruby/issues/8365")
+      end
+
       closure_class = Class.new(Closure) do
         def call(x, y)
           Pointer.new(x)[0] <=> Pointer.new(y)[0]
@@ -74,27 +78,32 @@ def call(x, y)
         qsort = Function.new(@libc['qsort'],
                              [TYPE_VOIDP, TYPE_SIZE_T, TYPE_SIZE_T, TYPE_VOIDP],
                              TYPE_VOID)
-        buff = "9341"
+        untouched = "9341"
+        buff = +"9341"
         qsort.call(buff, buff.size, 1, callback)
         assert_equal("1349", buff)
 
         bug4929 = '[ruby-core:37395]'
-        buff = "9341"
+        buff = +"9341"
         under_gc_stress do
           qsort.call(buff, buff.size, 1, callback)
         end
         assert_equal("1349", buff, bug4929)
+
+        # Ensure the test didn't mutate String literals
+        assert_equal("93" + "41", untouched)
       end
     ensure
       # We can't use ObjectSpace with JRuby.
-      return if RUBY_ENGINE == "jruby"
-      # Ensure freeing all closures.
-      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
-      not_freed_closures = []
-      ObjectSpace.each_object(Fiddle::Closure) do |closure|
-        not_freed_closures << closure unless closure.freed?
+      unless RUBY_ENGINE == "jruby"
+        # Ensure freeing all closures.
+        # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
+        not_freed_closures = []
+        ObjectSpace.each_object(Fiddle::Closure) do |closure|
+          not_freed_closures << closure unless closure.freed?
+        end
+        assert_equal([], not_freed_closures)
       end
-      assert_equal([], not_freed_closures)
     end
 
     def test_snprintf
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
index b4b2df2874f639..6ec40bee06cd58 100644
--- a/test/fiddle/test_function.rb
+++ b/test/fiddle/test_function.rb
@@ -41,6 +41,9 @@ def test_need_gvl?
       if RUBY_ENGINE == "jruby"
         omit("rb_str_dup() doesn't exist in JRuby")
       end
+      if RUBY_ENGINE == "truffleruby"
+        omit("rb_str_dup() doesn't work with TruffleRuby")
+      end
 
       libruby = Fiddle.dlopen(nil)
       rb_str_dup = Function.new(libruby['rb_str_dup'],
@@ -109,8 +112,8 @@ def call one
     end
 
     def test_last_error
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle.last_error doesn't work with JRuby")
+      if ffi_backend?
+        omit("Fiddle.last_error doesn't work with FFI backend")
       end
 
       func = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
@@ -219,6 +222,9 @@ def test_no_memory_leak
       if RUBY_ENGINE == "jruby"
         omit("rb_obj_frozen_p() doesn't exist in JRuby")
       end
+      if RUBY_ENGINE == "truffleruby"
+        omit("memory leak detection is fragile with TruffleRuby")
+      end
 
       if respond_to?(:assert_nothing_leaked_memory)
         rb_obj_frozen_p_symbol = Fiddle.dlopen(nil)["rb_obj_frozen_p"]
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
index 2a51add8523444..e0ad17a9cb41fc 100644
--- a/test/fiddle/test_handle.rb
+++ b/test/fiddle/test_handle.rb
@@ -9,8 +9,8 @@ class TestHandle < TestCase
     include Fiddle
 
     def test_to_i
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle::Handle#to_i is unavailable with JRuby")
+      if ffi_backend?
+        omit("Fiddle::Handle#to_i is unavailable with FFI backend")
       end
 
       handle = Fiddle::Handle.new(LIBC_SO)
@@ -18,8 +18,8 @@ def test_to_i
     end
 
     def test_to_ptr
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle::Handle#to_i is unavailable with JRuby")
+      if ffi_backend?
+        omit("Fiddle::Handle#to_i is unavailable with FFI backend")
       end
 
       handle = Fiddle::Handle.new(LIBC_SO)
@@ -34,8 +34,8 @@ def test_static_sym_unknown
     end
 
     def test_static_sym
-      if RUBY_ENGINE == "jruby"
-        omit("We can't assume static symbols with JRuby")
+      if ffi_backend?
+        omit("We can't assume static symbols with FFI backend")
       end
 
       begin
@@ -133,8 +133,8 @@ def test_disable_close
     end
 
     def test_file_name
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle::Handle#file_name doesn't exist in JRuby")
+      if ffi_backend?
+        omit("Fiddle::Handle#file_name doesn't exist in FFI backend")
       end
 
       file_name = Handle.new(LIBC_SO).file_name
@@ -155,8 +155,8 @@ def test_file_name
     end
 
     def test_NEXT
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle::Handle::NEXT doesn't exist in JRuby")
+      if ffi_backend?
+        omit("Fiddle::Handle::NEXT doesn't exist in FFI backend")
       end
 
       begin
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
index 26190325ecdfeb..79b65d97f52386 100644
--- a/test/fiddle/test_import.rb
+++ b/test/fiddle/test_import.rb
@@ -154,8 +154,8 @@ def test_unsigned_result()
     end
 
     def test_io()
-      if RUBY_ENGINE == "jruby"
-        omit("BUILD_RUBY_PLATFORM doesn't exist in JRuby")
+      if ffi_backend?
+        omit("BUILD_RUBY_PLATFORM doesn't exist in FFI backend")
       end
 
       if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM ) || !defined?(LIBC.fprintf)
diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb
index ea8015438ef1f5..d46fb662bafadb 100644
--- a/test/fiddle/test_pointer.rb
+++ b/test/fiddle/test_pointer.rb
@@ -11,8 +11,8 @@ def dlwrap arg
     end
 
     def test_can_read_write_memory
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle::Pointer.{read,write} don't exist in JRuby")
+      if ffi_backend?
+        omit("Fiddle::Pointer.{read,write} don't exist in FFI backend")
       end
 
       # Allocate some memory
@@ -113,8 +113,8 @@ def test_plus
     end
 
     def test_inspect
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle::Pointer#inspect is incompatible on JRuby")
+      if ffi_backend?
+        omit("Fiddle::Pointer#inspect is incompatible with FFI backend")
       end
 
       ptr = Pointer.new(0)
@@ -132,8 +132,8 @@ def test_to_ptr_string
     end
 
     def test_to_ptr_io
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle::Pointer.to_ptr(IO) isn't supported with JRuby")
+      if ffi_backend?
+        omit("Fiddle::Pointer.to_ptr(IO) isn't supported with FFI backend")
       end
 
       Pointer.malloc(10, Fiddle::RUBY_FREE) do |buf|
@@ -183,8 +183,8 @@ def test_cmp
     end
 
     def test_ref_ptr
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle.dlwrap([]) isn't supported with JRuby")
+      if ffi_backend?
+        omit("Fiddle.dlwrap([]) isn't supported with FFI backend")
       end
 
       ary = [0,1,2,4,5]
@@ -195,8 +195,8 @@ def test_ref_ptr
     end
 
     def test_to_value
-      if RUBY_ENGINE == "jruby"
-        omit("Fiddle.dlwrap([]) isn't supported with JRuby")
+      if ffi_backend?
+        omit("Fiddle.dlwrap([]) isn't supported with FFI backend")
       end
 
       ary = [0,1,2,4,5]

From 80136b6abcf51c3caa5e12aa3ab690fc5693ba89 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Fri, 11 Oct 2024 15:04:57 +0900
Subject: [PATCH 052/140] Bump version

---
 ext/fiddle/lib/fiddle/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/fiddle/lib/fiddle/version.rb b/ext/fiddle/lib/fiddle/version.rb
index 3444e24f926a2a..ad7a9655d393b0 100644
--- a/ext/fiddle/lib/fiddle/version.rb
+++ b/ext/fiddle/lib/fiddle/version.rb
@@ -1,3 +1,3 @@
 module Fiddle
-  VERSION = "1.1.3.dev"
+  VERSION = "1.1.4.dev"
 end

From fdbead76ec83a791b0319c7db29e210a410015f4 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Mon, 14 Oct 2024 14:08:10 +0200
Subject: [PATCH 053/140] [ruby/json] ractor_test.rb: ignore stderr

When rubygems is double loaded it fails the test.

The warning should happen in the first place but this
makes the test more resilient.

https://github.com/ruby/json/commit/513ddeaeb1
---
 test/json/ractor_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/json/ractor_test.rb b/test/json/ractor_test.rb
index ba9bf7a7f6d8a7..36196ed23db7d7 100644
--- a/test/json/ractor_test.rb
+++ b/test/json/ractor_test.rb
@@ -9,7 +9,7 @@
 
 class JSONInRactorTest < Test::Unit::TestCase
   def test_generate
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
     begin;
       $VERBOSE = nil
       require "json"

From 8af6606b225ade043322cf9d50ac9622c3f69226 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 11:16:17 +0900
Subject: [PATCH 054/140] Restore missing test-case from
 https://github.com/ruby/json/commit/c5a6d8042752dca312cfb407a6d3e594458d1cd6

Co-authored-by: "Jean Boussier" <byroot@ruby-lang.org>
---
 test/json/json_generator_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
index fd70b02699a4ab..2436fa0627d841 100755
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -446,6 +446,15 @@ def test_invalid_encoding_string
   end
 
   if defined?(JSON::Ext::Generator) and RUBY_PLATFORM != "java"
+    def test_valid_utf8_in_different_encoding
+      utf8_string = "€™"
+      wrong_encoding_string = utf8_string.b
+      # This behavior is historical. Not necessary desirable. We should deprecated it.
+      # The pure and java version of the gem already don't behave this way.
+      assert_equal utf8_string.to_json, wrong_encoding_string.to_json
+      assert_equal JSON.dump(utf8_string), JSON.dump(wrong_encoding_string)
+    end
+
     def test_string_ext_included_calls_super
       included = false
 

From a4bb2491f0671a95476688a47b996441c76b1b18 Mon Sep 17 00:00:00 2001
From: git <svn-admin@ruby-lang.org>
Date: Wed, 16 Oct 2024 02:25:38 +0000
Subject: [PATCH 055/140] Update default gems list at
 8af6606b225ade043322cf9d50ac96 [ci skip]

---
 NEWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 25e42db1a944eb..61e7bc790a5bfb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -80,7 +80,7 @@ The following default gems are updated.
 * RubyGems 3.6.0.dev
 * bundler 2.6.0.dev
 * erb 4.0.4
-* fiddle 1.1.3.dev
+* fiddle 1.1.4.dev
 * io-console 0.7.2
 * irb 1.14.1
 * json 2.7.2

From 3c1b0f21aa6dd7b7cfde67497c5b50717cdf14d2 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 12:51:38 +0900
Subject: [PATCH 056/140] [ruby/json] Fixed load path for ext version

https://github.com/ruby/json/commit/c17823688e
---
 test/json/test_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/json/test_helper.rb b/test/json/test_helper.rb
index 446c020e8fbf03..10478aef7e583d 100644
--- a/test/json/test_helper.rb
+++ b/test/json/test_helper.rb
@@ -1,12 +1,12 @@
 case ENV['JSON']
 when 'pure'
-  $:.unshift File.join(__dir__, '../lib')
+  $:.unshift File.join(__dir__, '../../lib')
   require 'json/pure'
 when 'ext'
-  $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
+  $:.unshift File.join(__dir__, '../../ext'), File.join(__dir__, '../../lib')
   require 'json/ext'
 else
-  $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
+  $:.unshift File.join(__dir__, '../../ext'), File.join(__dir__, '../../lib')
   require 'json'
 end
 

From 1379ef6f7d1570f60f03417ecc9f44f0104d5a18 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 12:54:07 +0900
Subject: [PATCH 057/140] [ruby/json] Embedded helper.rb into test_helper.rb

https://github.com/ruby/json/commit/f8417ffc69
---
 test/json/test_helper.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/json/test_helper.rb b/test/json/test_helper.rb
index 10478aef7e583d..4955a02c9dde31 100644
--- a/test/json/test_helper.rb
+++ b/test/json/test_helper.rb
@@ -15,3 +15,8 @@
   require 'byebug'
 rescue LoadError
 end
+
+unless defined?(Test::Unit::CoreAssertions)
+  require "core_assertions"
+  Test::Unit::TestCase.include Test::Unit::CoreAssertions
+end

From a7a0fb9ba3794e5cc563b6b14f34f0ab43914ca9 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 13:35:20 +0900
Subject: [PATCH 058/140] Followed up https://github.com/ruby/json/pull/613

---
 tool/sync_default_gems.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index a7ad331c999894..9fca49ad170d2d 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -192,7 +192,7 @@ def sync_default_gems(gem)
     when "json"
       rm_rf(%w[ext/json test/json])
       cp_r("#{upstream}/ext/json/ext", "ext/json")
-      cp_r("#{upstream}/tests", "test/json")
+      cp_r("#{upstream}/test/json", "test/json")
       rm_rf("test/json/lib")
       cp_r("#{upstream}/lib", "ext/json")
       cp_r("#{upstream}/json.gemspec", "ext/json")

From 199691553e8bf3dd5c17b815aaed6f346e0bdf95 Mon Sep 17 00:00:00 2001
From: ydah <t.yudai92@gmail.com>
Date: Wed, 16 Oct 2024 13:50:50 +0900
Subject: [PATCH 059/140] [ruby/json] Godounov ==> Godunov

https://github.com/ruby/json/commit/dbf7e9f473
---
 benchmark/data/citm_catalog.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmark/data/citm_catalog.json b/benchmark/data/citm_catalog.json
index 245fdbbedf478e..149b2aa358839f 100644
--- a/benchmark/data/citm_catalog.json
+++ b/benchmark/data/citm_catalog.json
@@ -1406,7 +1406,7 @@
             "description": null,
             "id": 138586671,
             "logo": "/images/UE0AAAAACEKqLwAAAAlDSVRN",
-            "name": "Boris Godounov - M.Moussorgski (version de concert)",
+            "name": "Boris Godunov - M.Moussorgski (version de concert)",
             "subTopicIds": [
                 337184284,
                 337184298,
@@ -50466,4 +50466,4 @@
     "venueNames": {
         "PLEYEL_PLEYEL": "Salle Pleyel"
     }
-}
\ No newline at end of file
+}

From fdcdc05b422301c9d3b7872872fb875c57d1080f Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 16:27:24 +0900
Subject: [PATCH 060/140] [ruby/yaml] Removed confused VERSION constant for
 YAML::DBM

https://github.com/ruby/yaml/commit/952fd361b1
---
 lib/yaml/dbm.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/yaml/dbm.rb b/lib/yaml/dbm.rb
index e2508cd74b38c1..1a9590e09943d1 100644
--- a/lib/yaml/dbm.rb
+++ b/lib/yaml/dbm.rb
@@ -16,7 +16,6 @@ module YAML
 #
 # See the documentation for ::DBM and ::YAML for more information.
 class DBM < ::DBM
-    VERSION = "0.1" # :nodoc:
 
     # :call-seq:
     #   ydbm[key] -> value

From 623897c97ee56b05668c29829634a4b89e145393 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 16:33:00 +0900
Subject: [PATCH 061/140] [ruby/yaml] Added basic test cases

https://github.com/ruby/yaml/commit/36a339c0d7
---
 test/yaml/test_dbm.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 test/yaml/test_dbm.rb

diff --git a/test/yaml/test_dbm.rb b/test/yaml/test_dbm.rb
new file mode 100644
index 00000000000000..c90b46a263516d
--- /dev/null
+++ b/test/yaml/test_dbm.rb
@@ -0,0 +1,25 @@
+require "test/unit"
+require "yaml/dbm"
+
+class TestYAMLDBM < Test::Unit::TestCase
+  def setup
+    @dbm = YAML::DBM.new("test")
+  end
+
+  def teardown
+    @dbm.close
+    File.unlink("test.db")
+  end
+
+  def test_fetch
+    @dbm["key"] = "value"
+    assert_equal "value", @dbm["key"]
+    assert_equal "value", @dbm.fetch("key")
+  end
+
+  def test_delete
+    @dbm["key"] = "value"
+    assert_equal "value", @dbm.delete("key")
+    assert_nil @dbm["key"]
+  end
+end
\ No newline at end of file

From d45fb19ee579eb8b28e4dd565bf21c0044ceb326 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 16:36:34 +0900
Subject: [PATCH 062/140] [ruby/yaml] Prefer to use YAML.safe_load

https://github.com/ruby/yaml/commit/c3d0f64224
---
 lib/yaml/dbm.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/yaml/dbm.rb b/lib/yaml/dbm.rb
index 1a9590e09943d1..167799bcd49fe0 100644
--- a/lib/yaml/dbm.rb
+++ b/lib/yaml/dbm.rb
@@ -55,7 +55,13 @@ def []=( key, val )
     def fetch( keystr, ifnone = nil )
         begin
             val = super( keystr )
-            return YAML.load( val ) if String === val
+            if String === val
+                if YAML.respond_to?(:safe_load)
+                    return YAML.safe_load( val )
+                else
+                    return YAML.load( val )
+                end
+            end
         rescue IndexError
         end
         if block_given?
@@ -101,7 +107,11 @@ def values_at( *keys )
     def delete( key )
         v = super( key )
         if String === v
-            v = YAML.load( v )
+            if YAML.respond_to?(:safe_load)
+                v = YAML.safe_load( v )
+            else
+                v = YAML.load( v )
+            end
         end
         v
     end

From 1d7547f50d1187f49b5cfec627425e657cdaf9af Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 16:45:49 +0900
Subject: [PATCH 063/140] [ruby/yaml] Also use safe_load with each_value,
 values and shift

https://github.com/ruby/yaml/commit/f47d6123eb
---
 lib/yaml/dbm.rb       |  8 +++++---
 test/yaml/test_dbm.rb | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/lib/yaml/dbm.rb b/lib/yaml/dbm.rb
index 167799bcd49fe0..126d72dd4d9c89 100644
--- a/lib/yaml/dbm.rb
+++ b/lib/yaml/dbm.rb
@@ -158,7 +158,7 @@ def each_pair # :yields: [key, value]
     #
     # Returns +self+.
     def each_value # :yields: value
-        super { |v| yield YAML.load( v ) }
+        super { |v| yield YAML.respond_to?(:safe_load) ? YAML.safe_load( v ) : YAML.load( v ) }
         self
     end
 
@@ -167,7 +167,7 @@ def each_value # :yields: value
     #
     # Returns an array of values from the database.
     def values
-        super.collect { |v| YAML.load( v ) }
+        super.collect { |v| YAML.respond_to?(:safe_load) ? YAML.safe_load( v ) : YAML.load( v ) }
     end
 
     # :call-seq:
@@ -213,7 +213,9 @@ def replace( hsh )
     # The order in which values are removed/returned is not guaranteed.
     def shift
         a = super
-        a[1] = YAML.load( a[1] ) if a
+        if a
+          a[1] = YAML.respond_to?(:safe_load) ? YAML.safe_load( a[1] ) : YAML.load( a[1] )
+        end
         a
     end
 
diff --git a/test/yaml/test_dbm.rb b/test/yaml/test_dbm.rb
index c90b46a263516d..15d441d23b0890 100644
--- a/test/yaml/test_dbm.rb
+++ b/test/yaml/test_dbm.rb
@@ -22,4 +22,25 @@ def test_delete
     assert_equal "value", @dbm.delete("key")
     assert_nil @dbm["key"]
   end
+
+  def test_each_value
+    @dbm["key1"] = "value1"
+    @dbm["key2"] = "value2"
+    @dbm.each_value do |value|
+      assert_match(/value[12]/, value)
+    end
+  end
+
+  def test_values
+    @dbm["key1"] = "value1"
+    @dbm["key2"] = "value2"
+    @dbm.values.each do |value|
+      assert_match(/value[12]/, value)
+    end
+  end
+
+  def test_shift
+    @dbm["key"] = "value"
+    assert_equal ["key", "value"], @dbm.shift
+  end
 end
\ No newline at end of file

From 21bac99122188d3b7852dc67563ac15bbd67ba05 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 16:49:51 +0900
Subject: [PATCH 064/140] [ruby/yaml] Make YAML::DBM optional

https://github.com/ruby/yaml/commit/f7c44d3fd7
---
 lib/yaml/dbm.rb       | 8 ++++++--
 test/yaml/test_dbm.rb | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/yaml/dbm.rb b/lib/yaml/dbm.rb
index 126d72dd4d9c89..a3cbaeccf66256 100644
--- a/lib/yaml/dbm.rb
+++ b/lib/yaml/dbm.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: false
 require 'yaml'
-require 'dbm'
+
+begin
+  require 'dbm'
+rescue LoadError
+end
 
 module YAML
 
@@ -288,4 +292,4 @@ def to_hash
     alias :each :each_pair
 end
 
-end
+end if defined?(DBM)
diff --git a/test/yaml/test_dbm.rb b/test/yaml/test_dbm.rb
index 15d441d23b0890..cf50256298174c 100644
--- a/test/yaml/test_dbm.rb
+++ b/test/yaml/test_dbm.rb
@@ -43,4 +43,4 @@ def test_shift
     @dbm["key"] = "value"
     assert_equal ["key", "value"], @dbm.shift
   end
-end
\ No newline at end of file
+end if defined?(YAML::DBM)

From c1f6ad561bfb584ac9fc477f0855d087ce4bcd6d Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 17:33:20 +0900
Subject: [PATCH 065/140] [ruby/yaml] Also use safe_load on YAML::Store

https://github.com/ruby/yaml/commit/09691d005f
---
 lib/yaml/store.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
index f24e4ad332d7da..859621d271e91f 100644
--- a/lib/yaml/store.rb
+++ b/lib/yaml/store.rb
@@ -69,8 +69,8 @@ def dump(table)
   end
 
   def load(content)
-    table = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(content) : YAML.load(content)
-    if table == false
+    table = YAML.respond_to?(:safe_load) ? YAML.safe_load(content, permitted_classes: [Symbol]) : YAML.load(content)
+    if table == false || table == nil
       {}
     else
       table

From 2bf9c82f1b8f2c6807e1c93cc660ea3cee45120a Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 16 Oct 2024 17:41:56 +0900
Subject: [PATCH 066/140] [ruby/yaml] Support old version of Psych

https://github.com/ruby/yaml/commit/5b39653c52
---
 lib/yaml/store.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
index 859621d271e91f..27c823b9f936f1 100644
--- a/lib/yaml/store.rb
+++ b/lib/yaml/store.rb
@@ -69,7 +69,15 @@ def dump(table)
   end
 
   def load(content)
-    table = YAML.respond_to?(:safe_load) ? YAML.safe_load(content, permitted_classes: [Symbol]) : YAML.load(content)
+    table =  if YAML.respond_to?(:safe_load)
+      if Psych::VERSION >= "3.1"
+        YAML.safe_load(content, permitted_classes: [Symbol])
+      else
+        YAML.safe_load(content, [Symbol])
+      end
+    else
+      YAML.load(content)
+    end
     if table == false || table == nil
       {}
     else

From c6c1e111b1d917103652c400fada09313457dc73 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Tue, 15 Oct 2024 10:26:58 -0400
Subject: [PATCH 067/140] Remove unused shared GC configuration in GitHub
 Actions

Shared GC CI is no longer running in the compilers workflow, so we can
remove it from .github/actions/compilers/entrypoint.sh.
---
 .github/actions/compilers/entrypoint.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/actions/compilers/entrypoint.sh b/.github/actions/compilers/entrypoint.sh
index 198ac0e1746da6..a83d90be91e161 100755
--- a/.github/actions/compilers/entrypoint.sh
+++ b/.github/actions/compilers/entrypoint.sh
@@ -70,14 +70,6 @@ fi
 
 pushd ${builddir}
 
-case "${INPUT_APPEND_CONFIGURE}" in
-*--with-shared-gc*)
-    export RUBY_GC_LIBRARY='librubygc.default.so'
-    mkdir -p /home/runner/shared-gc
-    grouped make shared-gc SHARED_GC=default
-    ;;
-esac
-
 grouped make showflags
 grouped make all
 grouped make test

From ebfe615a0cdffc28a73f279e3df8068831ddbf6e Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Wed, 16 Oct 2024 09:45:44 -0400
Subject: [PATCH 068/140] Skip GC compaction tests in test_yjit.rb when not
 supported

---
 test/ruby/test_yjit.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/ruby/test_yjit.rb b/test/ruby/test_yjit.rb
index c91d6312560ec6..5f0a5035b0a4fc 100644
--- a/test/ruby/test_yjit.rb
+++ b/test/ruby/test_yjit.rb
@@ -1150,6 +1150,8 @@ def test_code_gc_with_many_iseqs
   end
 
   def test_code_gc_with_auto_compact
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
     assert_compiles((code_gc_helpers + <<~'RUBY'), exits: :any, result: :ok, mem_size: 1, code_gc: true)
       # Test ISEQ moves in the middle of code GC
       GC.auto_compact = true
@@ -1278,6 +1280,8 @@ def foo(_, a, b, c)
   end
 
   def test_gc_compact_cyclic_branch
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
     assert_compiles(<<~'RUBY', result: 2)
       def foo
         i = 0

From 550ae745f6ad400c2de381ed21ed65ae6f574c6d Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Tue, 15 Oct 2024 08:37:34 -0400
Subject: [PATCH 069/140] [ruby/prism] Relocation

https://github.com/ruby/prism/commit/5ea6042408
---
 lib/prism.rb                          |   1 +
 lib/prism/prism.gemspec               |   3 +
 lib/prism/relocation.rb               | 504 ++++++++++++++++++++++++++
 prism/templates/lib/prism/node.rb.erb | 101 ++++++
 sample/prism/relocate_constants.rb    |  43 +++
 test/prism/ruby/relocation_test.rb    | 192 ++++++++++
 6 files changed, 844 insertions(+)
 create mode 100644 lib/prism/relocation.rb
 create mode 100644 sample/prism/relocate_constants.rb
 create mode 100644 test/prism/ruby/relocation_test.rb

diff --git a/lib/prism.rb b/lib/prism.rb
index 50b14a54861919..94f4c8ca5f8a55 100644
--- a/lib/prism.rb
+++ b/lib/prism.rb
@@ -24,6 +24,7 @@ module Prism
   autoload :Pack, "prism/pack"
   autoload :Pattern, "prism/pattern"
   autoload :Reflection, "prism/reflection"
+  autoload :Relocation, "prism/relocation"
   autoload :Serialize, "prism/serialize"
   autoload :StringQuery, "prism/string_query"
   autoload :Translation, "prism/translation"
diff --git a/lib/prism/prism.gemspec b/lib/prism/prism.gemspec
index 6123b71fc8ea8a..0f8881f24cbde2 100644
--- a/lib/prism/prism.gemspec
+++ b/lib/prism/prism.gemspec
@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
     "docs/parser_translation.md",
     "docs/parsing_rules.md",
     "docs/releasing.md",
+    "docs/relocation.md",
     "docs/ripper_translation.md",
     "docs/ruby_api.md",
     "docs/ruby_parser_translation.md",
@@ -88,6 +89,7 @@ Gem::Specification.new do |spec|
     "lib/prism/polyfill/byteindex.rb",
     "lib/prism/polyfill/unpack1.rb",
     "lib/prism/reflection.rb",
+    "lib/prism/relocation.rb",
     "lib/prism/serialize.rb",
     "lib/prism/string_query.rb",
     "lib/prism/translation.rb",
@@ -130,6 +132,7 @@ Gem::Specification.new do |spec|
     "sig/prism/parse_result.rbs",
     "sig/prism/pattern.rbs",
     "sig/prism/reflection.rbs",
+    "sig/prism/relocation.rbs",
     "sig/prism/serialize.rbs",
     "sig/prism/string_query.rbs",
     "sig/prism/visitor.rbs",
diff --git a/lib/prism/relocation.rb b/lib/prism/relocation.rb
new file mode 100644
index 00000000000000..ad914396f63272
--- /dev/null
+++ b/lib/prism/relocation.rb
@@ -0,0 +1,504 @@
+# frozen_string_literal: true
+
+module Prism
+  # Prism parses deterministically for the same input. This provides a nice
+  # property that is exposed through the #node_id API on nodes. Effectively this
+  # means that for the same input, these values will remain consistent every
+  # time the source is parsed. This means we can reparse the source same with a
+  # #node_id value and find the exact same node again.
+  #
+  # The Relocation module provides an API around this property. It allows you to
+  # "save" nodes and locations using a minimal amount of memory (just the
+  # node_id and a field identifier) and then reify them later.
+  module Relocation
+    # An entry in a repository that will lazily reify its values when they are
+    # first accessed.
+    class Entry
+      # Raised if a value that could potentially be on an entry is missing
+      # because it was either not configured on the repository or it has not yet
+      # been fetched.
+      class MissingValueError < StandardError
+      end
+
+      # Initialize a new entry with the given repository.
+      def initialize(repository)
+        @repository = repository
+        @values = nil
+      end
+
+      # Fetch the filepath of the value.
+      def filepath
+        fetch_value(:filepath)
+      end
+
+      # Fetch the start line of the value.
+      def start_line
+        fetch_value(:start_line)
+      end
+
+      # Fetch the end line of the value.
+      def end_line
+        fetch_value(:end_line)
+      end
+
+      # Fetch the start byte offset of the value.
+      def start_offset
+        fetch_value(:start_offset)
+      end
+
+      # Fetch the end byte offset of the value.
+      def end_offset
+        fetch_value(:end_offset)
+      end
+
+      # Fetch the start character offset of the value.
+      def start_character_offset
+        fetch_value(:start_character_offset)
+      end
+
+      # Fetch the end character offset of the value.
+      def end_character_offset
+        fetch_value(:end_character_offset)
+      end
+
+      # Fetch the start code units offset of the value, for the encoding that
+      # was configured on the repository.
+      def start_code_units_offset
+        fetch_value(:start_code_units_offset)
+      end
+
+      # Fetch the end code units offset of the value, for the encoding that was
+      # configured on the repository.
+      def end_code_units_offset
+        fetch_value(:end_code_units_offset)
+      end
+
+      # Fetch the start byte column of the value.
+      def start_column
+        fetch_value(:start_column)
+      end
+
+      # Fetch the end byte column of the value.
+      def end_column
+        fetch_value(:end_column)
+      end
+
+      # Fetch the start character column of the value.
+      def start_character_column
+        fetch_value(:start_character_column)
+      end
+
+      # Fetch the end character column of the value.
+      def end_character_column
+        fetch_value(:end_character_column)
+      end
+
+      # Fetch the start code units column of the value, for the encoding that
+      # was configured on the repository.
+      def start_code_units_column
+        fetch_value(:start_code_units_column)
+      end
+
+      # Fetch the end code units column of the value, for the encoding that was
+      # configured on the repository.
+      def end_code_units_column
+        fetch_value(:end_code_units_column)
+      end
+
+      # Fetch the leading comments of the value.
+      def leading_comments
+        fetch_value(:leading_comments)
+      end
+
+      # Fetch the trailing comments of the value.
+      def trailing_comments
+        fetch_value(:trailing_comments)
+      end
+
+      # Fetch the leading and trailing comments of the value.
+      def comments
+        leading_comments.concat(trailing_comments)
+      end
+
+      # Reify the values on this entry with the given values. This is an
+      # internal-only API that is called from the repository when it is time to
+      # reify the values.
+      def reify!(values) # :nodoc:
+        @repository = nil
+        @values = values
+      end
+
+      private
+
+      # Fetch a value from the entry, raising an error if it is missing.
+      def fetch_value(name)
+        values.fetch(name) do
+          raise MissingValueError, "No value for #{name}, make sure the " \
+            "repository has been properly configured"
+        end
+      end
+
+      # Return the values from the repository, reifying them if necessary.
+      def values
+        @values || (@repository.reify!; @values)
+      end
+    end
+
+    # Represents the source of a repository that will be reparsed.
+    class Source
+      # The value that will need to be reparsed.
+      attr_reader :value
+
+      # Initialize the source with the given value.
+      def initialize(value)
+        @value = value
+      end
+
+      # Reparse the value and return the parse result.
+      def result
+        raise NotImplementedError, "Subclasses must implement #result"
+      end
+
+      # Create a code units cache for the given encoding.
+      def code_units_cache(encoding)
+        result.code_units_cache(encoding)
+      end
+    end
+
+    # A source that is represented by a file path.
+    class SourceFilepath < Source
+      # Reparse the file and return the parse result.
+      def result
+        Prism.parse_file(value)
+      end
+    end
+
+    # A source that is represented by a string.
+    class SourceString < Source
+      # Reparse the string and return the parse result.
+      def result
+        Prism.parse(value)
+      end
+    end
+
+    # A field that represents the file path.
+    class FilepathField
+      # The file path that this field represents.
+      attr_reader :value
+
+      # Initialize a new field with the given file path.
+      def initialize(value)
+        @value = value
+      end
+
+      # Fetch the file path.
+      def fields(_value)
+        { filepath: value }
+      end
+    end
+
+    # A field representing the start and end lines.
+    class LinesField
+      # Fetches the start and end line of a value.
+      def fields(value)
+        { start_line: value.start_line, end_line: value.end_line }
+      end
+    end
+
+    # A field representing the start and end byte offsets.
+    class OffsetsField
+      # Fetches the start and end byte offset of a value.
+      def fields(value)
+        { start_offset: value.start_offset, end_offset: value.end_offset }
+      end
+    end
+
+    # A field representing the start and end character offsets.
+    class CharacterOffsetsField
+      # Fetches the start and end character offset of a value.
+      def fields(value)
+        {
+          start_character_offset: value.start_character_offset,
+          end_character_offset: value.end_character_offset
+        }
+      end
+    end
+
+    # A field representing the start and end code unit offsets.
+    class CodeUnitOffsetsField
+      # A pointer to the repository object that is used for lazily creating a
+      # code units cache.
+      attr_reader :repository
+
+      # The associated encoding for the code units.
+      attr_reader :encoding
+
+      # Initialize a new field with the associated repository and encoding.
+      def initialize(repository, encoding)
+        @repository = repository
+        @encoding = encoding
+        @cache = nil
+      end
+
+      # Fetches the start and end code units offset of a value for a particular
+      # encoding.
+      def fields(value)
+        {
+          start_code_units_offset: value.cached_start_code_units_offset(cache),
+          end_code_units_offset: value.cached_end_code_units_offset(cache)
+        }
+      end
+
+      private
+
+      # Lazily create a code units cache for the associated encoding.
+      def cache
+        @cache ||= repository.code_units_cache(encoding)
+      end
+    end
+
+    # A field representing the start and end byte columns.
+    class ColumnsField
+      # Fetches the start and end byte column of a value.
+      def fields(value)
+        { start_column: value.start_column, end_column: value.end_column }
+      end
+    end
+
+    # A field representing the start and end character columns.
+    class CharacterColumnsField
+      # Fetches the start and end character column of a value.
+      def fields(value)
+        {
+          start_character_column: value.start_character_column,
+          end_character_column: value.end_character_column
+        }
+      end
+    end
+
+    # A field representing the start and end code unit columns for a specific
+    # encoding.
+    class CodeUnitColumnsField
+      # The repository object that is used for lazily creating a code units
+      # cache.
+      attr_reader :repository
+
+      # The associated encoding for the code units.
+      attr_reader :encoding
+
+      # Initialize a new field with the associated repository and encoding.
+      def initialize(repository, encoding)
+        @repository = repository
+        @encoding = encoding
+        @cache = nil
+      end
+
+      # Fetches the start and end code units column of a value for a particular
+      # encoding.
+      def fields(value)
+        {
+          start_code_units_column: value.cached_start_code_units_column(cache),
+          end_code_units_column: value.cached_end_code_units_column(cache)
+        }
+      end
+
+      private
+
+      # Lazily create a code units cache for the associated encoding.
+      def cache
+        @cache ||= repository.code_units_cache(encoding)
+      end
+    end
+
+    # An abstract field used as the parent class of the two comments fields.
+    class CommentsField
+      # An object that represents a slice of a comment.
+      class Comment
+        # The slice of the comment.
+        attr_reader :slice
+
+        # Initialize a new comment with the given slice.
+        def initialize(slice)
+          @slice = slice
+        end
+      end
+
+      private
+
+      # Create comment objects from the given values.
+      def comments(values)
+        values.map { |value| Comment.new(value.slice) }
+      end
+    end
+
+    # A field representing the leading comments.
+    class LeadingCommentsField < CommentsField
+      # Fetches the leading comments of a value.
+      def fields(value)
+        { leading_comments: comments(value.leading_comments) }
+      end
+    end
+
+    # A field representing the trailing comments.
+    class TrailingCommentsField < CommentsField
+      # Fetches the trailing comments of a value.
+      def fields(value)
+        { trailing_comments: comments(value.trailing_comments) }
+      end
+    end
+
+    # A repository is a configured collection of fields and a set of entries
+    # that knows how to reparse a source and reify the values.
+    class Repository
+      # Raised when multiple fields of the same type are configured on the same
+      # repository.
+      class ConfigurationError < StandardError
+      end
+
+      # The source associated with this repository. This will be either a
+      # SourceFilepath (the most common use case) or a SourceString.
+      attr_reader :source
+
+      # The fields that have been configured on this repository.
+      attr_reader :fields
+
+      # The entries that have been saved on this repository.
+      attr_reader :entries
+
+      # Initialize a new repository with the given source.
+      def initialize(source)
+        @source = source
+        @fields = {}
+        @entries = Hash.new { |hash, node_id| hash[node_id] = {} }
+      end
+
+      # Create a code units cache for the given encoding from the source.
+      def code_units_cache(encoding)
+        source.code_units_cache(encoding)
+      end
+
+      # Configure the filepath field for this repository and return self.
+      def filepath
+        raise ConfigurationError, "Can only specify filepath for a filepath source" unless source.is_a?(SourceFilepath)
+        field(:filepath, FilepathField.new(source.value))
+      end
+
+      # Configure the lines field for this repository and return self.
+      def lines
+        field(:lines, LinesField.new)
+      end
+
+      # Configure the offsets field for this repository and return self.
+      def offsets
+        field(:offsets, OffsetsField.new)
+      end
+
+      # Configure the character offsets field for this repository and return
+      # self.
+      def character_offsets
+        field(:character_offsets, CharacterOffsetsField.new)
+      end
+
+      # Configure the code unit offsets field for this repository for a specific
+      # encoding and return self.
+      def code_unit_offsets(encoding)
+        field(:code_unit_offsets, CodeUnitOffsetsField.new(self, encoding))
+      end
+
+      # Configure the columns field for this repository and return self.
+      def columns
+        field(:columns, ColumnsField.new)
+      end
+
+      # Configure the character columns field for this repository and return
+      # self.
+      def character_columns
+        field(:character_columns, CharacterColumnsField.new)
+      end
+
+      # Configure the code unit columns field for this repository for a specific
+      # encoding and return self.
+      def code_unit_columns(encoding)
+        field(:code_unit_columns, CodeUnitColumnsField.new(self, encoding))
+      end
+
+      # Configure the leading comments field for this repository and return
+      # self.
+      def leading_comments
+        field(:leading_comments, LeadingCommentsField.new)
+      end
+
+      # Configure the trailing comments field for this repository and return
+      # self.
+      def trailing_comments
+        field(:trailing_comments, TrailingCommentsField.new)
+      end
+
+      # Configure both the leading and trailing comment fields for this
+      # repository and return self.
+      def comments
+        leading_comments.trailing_comments
+      end
+
+      # This method is called from nodes and locations when they want to enter
+      # themselves into the repository. It it internal-only and meant to be
+      # called from the #save* APIs.
+      def enter(node_id, field_name) # :nodoc:
+        entry = Entry.new(self)
+        @entries[node_id][field_name] = entry
+        entry
+      end
+
+      # This method is called from the entries in the repository when they need
+      # to reify their values. It is internal-only and meant to be called from
+      # the various value APIs.
+      def reify! # :nodoc:
+        result = source.result
+
+        # Attach the comments if they have been requested as part of the
+        # configuration of this repository.
+        if fields.key?(:leading_comments) || fields.key?(:trailing_comments)
+          result.attach_comments!
+        end
+
+        queue = [result.value] #: Array[Prism::node]
+        while (node = queue.shift)
+          @entries[node.node_id].each do |field_name, entry|
+            value = node.public_send(field_name)
+            values = {}
+
+            fields.each_value do |field|
+              values.merge!(field.fields(value))
+            end
+
+            entry.reify!(values)
+          end
+
+          queue.concat(node.compact_child_nodes)
+        end
+
+        @entries.clear
+      end
+
+      private
+
+      # Append the given field to the repository and return the repository so
+      # that these calls can be chained.
+      def field(name, value)
+        raise ConfigurationError, "Cannot specify multiple #{name} fields" if @fields.key?(name)
+        @fields[name] = value
+        self
+      end
+    end
+
+    # Create a new repository for the given filepath.
+    def self.filepath(value)
+      Repository.new(SourceFilepath.new(value))
+    end
+
+    # Create a new repository for the given string.
+    def self.string(value)
+      Repository.new(SourceString.new(value))
+    end
+  end
+end
diff --git a/prism/templates/lib/prism/node.rb.erb b/prism/templates/lib/prism/node.rb.erb
index f033cdea9b16e4..72245cd30d6212 100644
--- a/prism/templates/lib/prism/node.rb.erb
+++ b/prism/templates/lib/prism/node.rb.erb
@@ -12,6 +12,11 @@ module Prism
     # will be consistent across multiple parses of the same source code.
     attr_reader :node_id
 
+    # Save this node using a saved source so that it can be retrieved later.
+    def save(repository)
+      repository.enter(node_id, :itself)
+    end
+
     # A Location instance that represents the location of this node in the
     # source.
     def location
@@ -20,6 +25,21 @@ module Prism
       @location = Location.new(source, location >> 32, location & 0xFFFFFFFF)
     end
 
+    # Save the location using a saved source so that it can be retrieved later.
+    def save_location(repository)
+      repository.enter(node_id, :location)
+    end
+
+    # Delegates to the start_line of the associated location object.
+    def start_line
+      location.start_line
+    end
+
+    # Delegates to the end_line of the associated location object.
+    def end_line
+      location.end_line
+    end
+
     # The start offset of the node in the source. This method is effectively a
     # delegate method to the location object.
     def start_offset
@@ -34,6 +54,75 @@ module Prism
       location.is_a?(Location) ? location.end_offset : ((location >> 32) + (location & 0xFFFFFFFF))
     end
 
+    # Delegates to the start_character_offset of the associated location object.
+    def start_character_offset
+      location.start_character_offset
+    end
+
+    # Delegates to the end_character_offset of the associated location object.
+    def end_character_offset
+      location.end_character_offset
+    end
+
+    # Delegates to the cached_start_code_units_offset of the associated location
+    # object.
+    def cached_start_code_units_offset(cache)
+      location.cached_start_code_units_offset(cache)
+    end
+
+    # Delegates to the cached_end_code_units_offset of the associated location
+    # object.
+    def cached_end_code_units_offset(cache)
+      location.cached_end_code_units_offset(cache)
+    end
+
+    # Delegates to the start_column of the associated location object.
+    def start_column
+      location.start_column
+    end
+
+    # Delegates to the end_column of the associated location object.
+    def end_column
+      location.end_column
+    end
+
+    # Delegates to the start_character_column of the associated location object.
+    def start_character_column
+      location.start_character_column
+    end
+
+    # Delegates to the end_character_column of the associated location object.
+    def end_character_column
+      location.end_character_column
+    end
+
+    # Delegates to the cached_start_code_units_column of the associated location
+    # object.
+    def cached_start_code_units_column(cache)
+      location.cached_start_code_units_column(cache)
+    end
+
+    # Delegates to the cached_end_code_units_column of the associated location
+    # object.
+    def cached_end_code_units_column(cache)
+      location.cached_end_code_units_column(cache)
+    end
+
+    # Delegates to the leading_comments of the associated location object.
+    def leading_comments
+      location.leading_comments
+    end
+
+    # Delegates to the trailing_comments of the associated location object.
+    def trailing_comments
+      location.trailing_comments
+    end
+
+    # Delegates to the comments of the associated location object.
+    def comments
+      location.comments
+    end
+
     # Returns all of the lines of the source code associated with this node.
     def source_lines
       location.source_lines
@@ -318,6 +407,12 @@ module Prism
       return location if location.is_a?(Location)
       @<%= field.name %> = Location.new(source, location >> 32, location & 0xFFFFFFFF)
     end
+
+    # Save the <%= field.name %> location using the given saved source so that
+    # it can be retrieved later.
+    def save_<%= field.name %>(repository)
+      repository.enter(node_id, :<%= field.name %>)
+    end
     <%- when Prism::Template::OptionalLocationField -%>
     def <%= field.name %>
       location = @<%= field.name %>
@@ -330,6 +425,12 @@ module Prism
         @<%= field.name %> = Location.new(source, location >> 32, location & 0xFFFFFFFF)
       end
     end
+
+    # Save the <%= field.name %> location using the given saved source so that
+    # it can be retrieved later.
+    def save_<%= field.name %>(repository)
+      repository.enter(node_id, :<%= field.name %>) unless @<%= field.name %>.nil?
+    end
     <%- else -%>
     attr_reader :<%= field.name %>
     <%- end -%>
diff --git a/sample/prism/relocate_constants.rb b/sample/prism/relocate_constants.rb
new file mode 100644
index 00000000000000..faa48f6388d4d4
--- /dev/null
+++ b/sample/prism/relocate_constants.rb
@@ -0,0 +1,43 @@
+# This script finds the declaration of all classes and modules and stores them
+# in a hash for an in-memory database of constants.
+
+require "prism"
+
+class RelocationVisitor < Prism::Visitor
+  attr_reader :index, :repository, :scope
+
+  def initialize(index, repository, scope = [])
+    @index = index
+    @repository = repository
+    @scope = scope
+  end
+
+  def visit_class_node(node)
+    next_scope = scope + node.constant_path.full_name_parts
+    index[next_scope.join("::")] << node.constant_path.save(repository)
+    node.body&.accept(RelocationVisitor.new(index, repository, next_scope))
+  end
+
+  def visit_module_node(node)
+    next_scope = scope + node.constant_path.full_name_parts
+    index[next_scope.join("::")] << node.constant_path.save(repository)
+    node.body&.accept(RelocationVisitor.new(index, repository, next_scope))
+  end
+end
+
+# Create an index that will store a mapping between the names of constants to a
+# list of the locations where they are declared or re-opened.
+index = Hash.new { |hash, key| hash[key] = [] }
+
+# Loop through every file in the lib directory of this repository and parse them
+# with Prism. Then visit them using the RelocateVisitor to store their
+# repository entries in the index.
+Dir[File.expand_path("../../lib/**/*.rb", __dir__)].each do |filepath|
+  repository = Prism::Relocation.filepath(filepath).filepath.lines.code_unit_columns(Encoding::UTF_16LE)
+  Prism.parse_file(filepath).value.accept(RelocationVisitor.new(index, repository))
+end
+
+puts index["Prism::ParametersNode"].map { |entry| "#{entry.filepath}:#{entry.start_line}:#{entry.start_code_units_column}" }
+# =>
+# prism/lib/prism/node.rb:13889:8
+# prism/lib/prism/node_ext.rb:267:8
diff --git a/test/prism/ruby/relocation_test.rb b/test/prism/ruby/relocation_test.rb
new file mode 100644
index 00000000000000..f8372afa6df32b
--- /dev/null
+++ b/test/prism/ruby/relocation_test.rb
@@ -0,0 +1,192 @@
+# frozen_string_literal: true
+
+require_relative "../test_helper"
+
+module Prism
+  class RelocationTest < TestCase
+    def test_repository_filepath
+      repository = Relocation.filepath(__FILE__).lines
+      declaration = Prism.parse_file(__FILE__).value.statements.body[1]
+
+      assert_equal 5, declaration.save(repository).start_line
+    end
+
+    def test_filepath
+      repository = Relocation.filepath(__FILE__).filepath
+      declaration = Prism.parse_file(__FILE__).value.statements.body[1]
+
+      assert_equal __FILE__, declaration.save(repository).filepath
+    end
+
+    def test_lines
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).lines
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal 1, node_entry.start_line
+      assert_equal 2, node_entry.end_line
+
+      assert_equal 1, location_entry.start_line
+      assert_equal 2, location_entry.end_line
+    end
+
+    def test_offsets
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).offsets
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_offset
+      assert_equal 13, node_entry.end_offset
+
+      assert_equal 6, location_entry.start_offset
+      assert_equal 13, location_entry.end_offset
+    end
+
+    def test_character_offsets
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).character_offsets
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_character_offset
+      assert_equal 10, node_entry.end_character_offset
+
+      assert_equal 6, location_entry.start_character_offset
+      assert_equal 10, location_entry.end_character_offset
+    end
+
+    def test_code_unit_offsets
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).code_unit_offsets(Encoding::UTF_16LE)
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_code_units_offset
+      assert_equal 11, node_entry.end_code_units_offset
+
+      assert_equal 6, location_entry.start_code_units_offset
+      assert_equal 11, location_entry.end_code_units_offset
+    end
+
+    def test_columns
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).columns
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_column
+      assert_equal 13, node_entry.end_column
+
+      assert_equal 6, location_entry.start_column
+      assert_equal 13, location_entry.end_column
+    end
+
+    def test_character_columns
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).character_columns
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_character_column
+      assert_equal 10, node_entry.end_character_column
+
+      assert_equal 6, location_entry.start_character_column
+      assert_equal 10, location_entry.end_character_column
+    end
+
+    def test_code_unit_columns
+      source = "class Foo😀\nend"
+      repository = Relocation.string(source).code_unit_columns(Encoding::UTF_16LE)
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.constant_path.save(repository)
+      location_entry = declaration.constant_path.save_location(repository)
+
+      assert_equal 6, node_entry.start_code_units_column
+      assert_equal 11, node_entry.end_code_units_column
+
+      assert_equal 6, location_entry.start_code_units_column
+      assert_equal 11, location_entry.end_code_units_column
+    end
+
+    def test_leading_comments
+      source = "# leading\nclass Foo\nend"
+      repository = Relocation.string(source).leading_comments
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal ["# leading"], node_entry.leading_comments.map(&:slice)
+      assert_equal ["# leading"], location_entry.leading_comments.map(&:slice)
+    end
+
+    def test_trailing_comments
+      source = "class Foo\nend\n# trailing"
+      repository = Relocation.string(source).trailing_comments
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal ["# trailing"], node_entry.trailing_comments.map(&:slice)
+      assert_equal ["# trailing"], location_entry.trailing_comments.map(&:slice)
+    end
+
+    def test_comments
+      source = "# leading\nclass Foo\nend\n# trailing"
+      repository = Relocation.string(source).comments
+      declaration = Prism.parse(source).value.statements.body.first
+
+      node_entry = declaration.save(repository)
+      location_entry = declaration.save_location(repository)
+
+      assert_equal ["# leading", "# trailing"], node_entry.comments.map(&:slice)
+      assert_equal ["# leading", "# trailing"], location_entry.comments.map(&:slice)
+    end
+
+    def test_misconfiguration
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").comments.leading_comments
+      end
+
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").comments.trailing_comments
+      end
+
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").code_unit_offsets(Encoding::UTF_8).code_unit_offsets(Encoding::UTF_16LE)
+      end
+
+      assert_raise Relocation::Repository::ConfigurationError do
+        Relocation.string("").lines.lines
+      end
+    end
+
+    def test_missing_values
+      source = "class Foo; end"
+      repository = Relocation.string(source).lines
+
+      declaration = Prism.parse(source).value.statements.body.first
+      entry = declaration.constant_path.save(repository)
+
+      assert_raise Relocation::Entry::MissingValueError do
+        entry.start_offset
+      end
+    end
+  end
+end

From f549448e5e1f3fe07159d6c7307fd4b4b500d826 Mon Sep 17 00:00:00 2001
From: BurdetteLamar <burdettelamar@yahoo.com>
Date: Tue, 15 Oct 2024 14:35:03 -0500
Subject: [PATCH 070/140] [DOC] Correct related for Array#shuffle!

---
 array.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/array.rb b/array.rb
index 23d38ebc655f7e..d09a20b9ab771f 100644
--- a/array.rb
+++ b/array.rb
@@ -63,7 +63,7 @@ def each
   #
   # The object given with keyword argument +random+ is used as the random number generator.
   #
-  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
+  # Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
   def shuffle!(random: Random)
     Primitive.rb_ary_shuffle_bang(random)
   end

From 3affd43c2de8cf556b2f143e577c0a3ccf2acc31 Mon Sep 17 00:00:00 2001
From: BurdetteLamar <burdettelamar@yahoo.com>
Date: Tue, 15 Oct 2024 14:32:12 -0500
Subject: [PATCH 071/140] [DOC] Tweaks for Array#shuffle

---
 array.rb | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/array.rb b/array.rb
index d09a20b9ab771f..f6c8af8f78360f 100644
--- a/array.rb
+++ b/array.rb
@@ -69,15 +69,24 @@ def shuffle!(random: Random)
   end
 
   # call-seq:
-  #    array.shuffle(random: Random) -> new_ary
+  #   shuffle(random: Random) -> new_array
   #
-  # Returns a new array with elements of +self+ shuffled.
-  #    a = [1, 2, 3] #=> [1, 2, 3]
-  #    a.shuffle     #=> [2, 3, 1]
-  #    a             #=> [1, 2, 3]
+  # Returns a new array containing all elements from +self+ in a random order,
+  # as selected by the object given by keyword argument +random+:
   #
-  # The optional +random+ argument will be used as the random number generator:
-  #    a.shuffle(random: Random.new(1))  #=> [1, 3, 2]
+  #   a =            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  #   a.shuffle # => [0, 8, 1, 9, 6, 3, 4, 7, 2, 5]
+  #   a.shuffle # => [8, 9, 0, 5, 1, 2, 6, 4, 7, 3]
+  #
+  # Duplicate elements are included:
+  #
+  #   a =            [0, 1, 0, 1, 0, 1, 0, 1, 0, 1]
+  #   a.shuffle # => [1, 0, 1, 1, 0, 0, 1, 0, 0, 1]
+  #   a.shuffle # => [1, 1, 0, 0, 0, 1, 1, 0, 0, 1]
+  #
+  # The object given with keyword argument +random+ is used as the random number generator.
+  #
+  # Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
   def shuffle(random: Random)
     Primitive.rb_ary_shuffle(random)
   end

From 9251971335ded7d1eb196f79648fdf12f1208954 Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Wed, 16 Oct 2024 14:22:26 -0400
Subject: [PATCH 072/140] [ruby/prism] Add a sample for multiplexing constants

https://github.com/ruby/prism/commit/e265dc5862
---
 sample/prism/multiplex_constants.rb | 138 ++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 sample/prism/multiplex_constants.rb

diff --git a/sample/prism/multiplex_constants.rb b/sample/prism/multiplex_constants.rb
new file mode 100644
index 00000000000000..5234292dfa4ea7
--- /dev/null
+++ b/sample/prism/multiplex_constants.rb
@@ -0,0 +1,138 @@
+# This script indexes the classes and modules within a set of files using the
+# saved source functionality.
+
+require "prism"
+require "etc"
+require "tempfile"
+
+module Indexer
+  # A class that implements the #enter functionality so that it can be passed to
+  # the various save* APIs. This effectively bundles up all of the node_id and
+  # field_name pairs so that they can be written back to the parent process.
+  class Repository
+    attr_reader :scope, :entries
+  
+    def initialize
+      @scope = []
+      @entries = []
+    end
+  
+    def with(next_scope)
+      previous_scope = scope
+      @scope = scope + next_scope
+      yield
+      @scope = previous_scope
+    end
+  
+    def empty?
+      entries.empty?
+    end
+  
+    def enter(node_id, field_name)
+      entries << [scope.join("::"), node_id, field_name]
+    end
+  end
+
+  # Visit the classes and modules in the AST and save their locations into the
+  # repository.
+  class Visitor < Prism::Visitor
+    attr_reader :repository
+
+    def initialize(repository)
+      @repository = repository
+    end
+
+    def visit_class_node(node)
+      repository.with(node.constant_path.full_name_parts) do
+        node.constant_path.save_location(repository)
+        visit(node.body)
+      end
+    end
+
+    def visit_module_node(node)
+      repository.with(node.constant_path.full_name_parts) do
+        node.constant_path.save_location(repository)
+        visit(node.body)
+      end
+    end
+  end
+
+  # Index the classes and modules within a file. If there are any entries,
+  # return them as a serialized string to the parent process.
+  def self.index(filepath)
+    repository = Repository.new
+    Prism.parse_file(filepath).value.accept(Visitor.new(repository))
+    "#{filepath}|#{repository.entries.join("|")}" unless repository.empty?
+  end
+end
+
+def index_glob(glob, count = Etc.nprocessors - 1)
+  process_ids = []
+  filepath_writers = []
+  index_reader, index_writer = IO.pipe
+
+  # For each number in count, fork off a worker that has access to two pipes.
+  # The first pipe is the index_writer, to which it writes all of the results of
+  # indexing the various files. The second pipe is the filepath_reader, from
+  # which it reads the filepaths that it needs to index.
+  count.times do
+    filepath_reader, filepath_writer = IO.pipe
+
+    process_ids << fork do
+      filepath_writer.close
+      index_reader.close
+
+      while (filepath = filepath_reader.gets(chomp: true))
+        results = Indexer.index(filepath)
+        index_writer.puts(results) if results
+      end
+    end
+
+    filepath_reader.close
+    filepath_writers << filepath_writer
+  end
+
+  index_writer.close
+
+  # In a separate thread, write all of the filepaths to the various worker
+  # processes. This is done in a separate threads since puts will eventually
+  # block when each of the pipe buffers fills up. We write in a round-robin
+  # fashion to the various workers. This could be improved using a work-stealing
+  # algorithm, but is fine if you don't end up having a ton of variety in the
+  # size of your files.
+  writer_thread =
+    Thread.new do
+      Dir[glob].each_with_index do |filepath, index|
+        filepath_writers[index % count].puts(filepath)
+      end
+    end
+
+  index = Hash.new { |hash, key| hash[key] = [] }
+
+  # In a separate thread, read all of the results from the various worker
+  # processes and store them in the index. This is done in a separate thread so
+  # that reads and writes can be interleaved. This is important so that the
+  # index pipe doesn't fill up and block the writer.
+  reader_thread =
+    Thread.new do
+      while (line = index_reader.gets(chomp: true))
+        filepath, *entries = line.split("|")
+        repository = Prism::Relocation.filepath(filepath).filepath.lines.code_unit_columns(Encoding::UTF_16LE).leading_comments
+
+        entries.each_slice(3) do |(name, node_id, field_name)|
+          index[name] << repository.enter(Integer(node_id), field_name.to_sym)
+        end
+      end
+    end
+
+  writer_thread.join
+  filepath_writers.each(&:close)
+
+  reader_thread.join
+  index_reader.close
+
+  process_ids.each { |process_id| Process.wait(process_id) }
+  index
+end
+
+index_glob(File.expand_path("../../lib/**/*.rb", __dir__))

From 78fb1ab84b78596fac6a219c66c1d897aba346bb Mon Sep 17 00:00:00 2001
From: git <svn-admin@ruby-lang.org>
Date: Wed, 16 Oct 2024 18:22:44 +0000
Subject: [PATCH 073/140] * remove trailing spaces. [ci skip]

---
 sample/prism/multiplex_constants.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sample/prism/multiplex_constants.rb b/sample/prism/multiplex_constants.rb
index 5234292dfa4ea7..e39f2c36f62fd2 100644
--- a/sample/prism/multiplex_constants.rb
+++ b/sample/prism/multiplex_constants.rb
@@ -11,23 +11,23 @@ module Indexer
   # field_name pairs so that they can be written back to the parent process.
   class Repository
     attr_reader :scope, :entries
-  
+
     def initialize
       @scope = []
       @entries = []
     end
-  
+
     def with(next_scope)
       previous_scope = scope
       @scope = scope + next_scope
       yield
       @scope = previous_scope
     end
-  
+
     def empty?
       entries.empty?
     end
-  
+
     def enter(node_id, field_name)
       entries << [scope.join("::"), node_id, field_name]
     end

From 5eca11ca5e5503e41b7ec81f03e63c59556c038c Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Tue, 15 Oct 2024 10:06:50 -0400
Subject: [PATCH 074/140] RubyVM::InstructionSequence.of
 Thread::Backtrace::Location

This would be useful for debugging.
---
 iseq.c                 |  5 ++++-
 test/ruby/test_iseq.rb | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/iseq.c b/iseq.c
index a60228c8e585eb..8c8e54b9895502 100644
--- a/iseq.c
+++ b/iseq.c
@@ -3029,7 +3029,10 @@ iseqw_s_of(VALUE klass, VALUE body)
 {
     const rb_iseq_t *iseq = NULL;
 
-    if (rb_obj_is_proc(body)) {
+    if (rb_frame_info_p(body)) {
+        iseq = rb_get_iseq_from_frame_info(body);
+    }
+    else if (rb_obj_is_proc(body)) {
         iseq = vm_proc_iseq(body);
 
         if (!rb_obj_is_iseq((VALUE)iseq)) {
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index 49aa4c5abd582e..9eb9c84602fbec 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -726,18 +726,24 @@ def test_to_binary_b_return_tracepoint
   end
 
   def test_iseq_of
-    [proc{},
-     method(:test_iseq_of),
-     RubyVM::InstructionSequence.compile("p 1", __FILE__)].each{|src|
+    [
+      proc{},
+      method(:test_iseq_of),
+      RubyVM::InstructionSequence.compile("p 1", __FILE__),
+      begin; raise "error"; rescue => error; error.backtrace_locations[0]; end
+    ].each{|src|
       iseq = RubyVM::InstructionSequence.of(src)
       assert_equal __FILE__, iseq.path
     }
   end
 
   def test_iseq_of_twice_for_same_code
-    [proc{},
-     method(:test_iseq_of_twice_for_same_code),
-     RubyVM::InstructionSequence.compile("p 1")].each{|src|
+    [
+      proc{},
+      method(:test_iseq_of_twice_for_same_code),
+      RubyVM::InstructionSequence.compile("p 1"),
+      begin; raise "error"; rescue => error; error.backtrace_locations[0]; end
+    ].each{|src|
       iseq1 = RubyVM::InstructionSequence.of(src)
       iseq2 = RubyVM::InstructionSequence.of(src)
 

From 4621c9b8154533e96a3f53de823578b1e171aa03 Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Wed, 16 Oct 2024 13:52:34 -0500
Subject: [PATCH 075/140] [DOC] Tweaks for Array#slice! (#11902)

---
 array.c | 99 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 61 insertions(+), 38 deletions(-)

diff --git a/array.c b/array.c
index 015395f74caa72..42601a5f82ef13 100644
--- a/array.c
+++ b/array.c
@@ -4145,71 +4145,94 @@ ary_slice_bang_by_rb_ary_splice(VALUE ary, long pos, long len)
 
 /*
  *  call-seq:
- *    array.slice!(n) -> object or nil
- *    array.slice!(start, length) -> new_array or nil
- *    array.slice!(range) -> new_array or nil
+ *    slice!(index) -> object or nil
+ *    slice!(start, length) -> new_array or nil
+ *    slice!(range) -> new_array or nil
  *
  *  Removes and returns elements from +self+.
  *
- *  When the only argument is an Integer +n+,
- *  removes and returns the _nth_ element in +self+:
+ *  With numeric argument +index+ given,
+ *  removes and returns the element at offset +index+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(1) # => "bar"
- *    a # => [:foo, 2]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(2)   # => "c"
+ *    a             # => ["a", "b", "d"]
+ *    a.slice!(2.1) # => "d"
+ *    a             # => ["a", "b"]
  *
- *  If +n+ is negative, counts backwards from the end of +self+:
+ *  If +index+ is negative, counts backwards from the end of +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(-1) # => 2
- *    a # => [:foo, "bar"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(-2) # => "c"
+ *    a            # => ["a", "b", "d"]
+ *
+ *  If +index+ is out of range, returns +nil+.
  *
- *  If +n+ is out of range, returns +nil+.
+ *  With numeric arguments +start+ and +length+ given,
+ *  removes +length+ elements from +self+ beginning at zero-based offset +start+;
+ *  returns the removed objects in a new array:
  *
- *  When the only arguments are Integers +start+ and +length+,
- *  removes +length+ elements from +self+ beginning at offset  +start+;
- *  returns the deleted objects in a new +Array+:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(1, 2)     # => ["b", "c"]
+ *    a                  # => ["a", "d"]
+ *    a.slice!(0.1, 1.1) # => ["a"]
+ *    a                  # => ["d"]
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(0, 2) # => [:foo, "bar"]
- *    a # => [2]
+ *  If +start+ is negative, counts backwards from the end of +self+:
+ *
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(-2, 1) # => ["c"]
+ *    a               # => ["a", "b", "d"]
+ *
+ *  If +start+ is out-of-range, returns +nil+:
+ *
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(5, 1)  # => nil
+ *    a.slice!(-5, 1) # => nil
  *
  *  If <tt>start + length</tt> exceeds the array size,
  *  removes and returns all elements from offset +start+ to the end:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(1, 50) # => ["bar", 2]
- *    a # => [:foo]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(2, 50) # => ["c", "d"]
+ *    a               # => ["a", "b"]
  *
  *  If <tt>start == a.size</tt> and +length+ is non-negative,
- *  returns a new empty +Array+.
+ *  returns a new empty array.
  *
  *  If +length+ is negative, returns +nil+.
  *
- *  When the only argument is a Range object +range+,
- *  treats <tt>range.min</tt> as +start+ above and <tt>range.size</tt> as +length+ above:
+ *  With Range argument +range+ given,
+ *  treats <tt>range.min</tt> as +start+ (as above)
+ *  and <tt>range.size</tt> as +length+ (as above):
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(1..2) # => ["bar", 2]
- *    a # => [:foo]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(1..2) # => ["b", "c"]
+ *    a              # => ["a", "d"]
  *
- *  If <tt>range.start == a.size</tt>, returns a new empty +Array+.
+ *  If <tt>range.start == a.size</tt>, returns a new empty array:
  *
- *  If <tt>range.start</tt> is larger than the array size, returns +nil+.
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(4..5) # => []
  *
- *  If <tt>range.end</tt> is negative, counts backwards from the end of the array:
+ *  If <tt>range.start</tt> is larger than the array size, returns +nil+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(0..-2) # => [:foo, "bar"]
- *    a # => [2]
+ *    a = ['a', 'b', 'c', 'd']
+      a.slice!(5..6) # => nil
  *
  *  If <tt>range.start</tt> is negative,
- *  calculates the start index backwards from the end of the array:
+ *  calculates the start index by counting backwards from the end of +self+:
  *
- *    a = [:foo, 'bar', 2]
- *    a.slice!(-2..2) # => ["bar", 2]
- *    a # => [:foo]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(-2..2) # => ["c"]
+ *
+ *  If <tt>range.end</tt> is negative,
+ *  calculates the end index by counting backwards from the end of +self+:
  *
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.slice!(0..-2) # => ["a", "b", "c"]
+ *
+ *  Related: see {Methods for Deleting}[rdoc-ref:Array@Methods+for+Deleting].
  */
 
 static VALUE

From 90aa6aefc4e351d3840cfd58872c5f42a11f4c7a Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Tue, 15 Oct 2024 15:46:23 -0400
Subject: [PATCH 076/140] Fix memory leak in syntax error in prism

If there is a syntax error, there could be an ast_node in the result.
This could get leaked if there is a syntax error so parsing could not
complete (parsed is not set to true).

For example, the following script leaks memory:

    10.times do
      10_000.times do
        eval("def foo(...) super(...) {}; end")
      rescue SyntaxError
      end

      puts `ps -o rss= -p #{$$}`
    end

Before:

    31328
    42768
    53856
    65120
    76208
    86768
    97856
    109120
    120208
    131296

After:

    20944
    20944
    20944
    20944
    20944
    20944
    20944
    20944
    20944
    20944
---
 prism_compile.c          |  4 +++-
 test/ruby/test_syntax.rb | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/prism_compile.c b/prism_compile.c
index aca358f8719989..04fc96e99098c2 100644
--- a/prism_compile.c
+++ b/prism_compile.c
@@ -10118,9 +10118,11 @@ pm_iseq_compile_node(rb_iseq_t *iseq, pm_scope_node_t *node)
 void
 pm_parse_result_free(pm_parse_result_t *result)
 {
-    if (result->parsed) {
+    if (result->node.ast_node != NULL) {
         pm_node_destroy(&result->parser, result->node.ast_node);
+    }
 
+    if (result->parsed) {
         xfree(result->node.constants);
         pm_scope_node_destroy(&result->node);
     }
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index 7a6c66d7824d41..edf5886a53b4d5 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -2204,6 +2204,20 @@ def test_argument_forwarding_with_super
     assert_syntax_error('def foo(...) super(1, ...) {}; end', /both block arg and actual block/)
   end
 
+  def test_argument_forwarding_with_super_memory_leak
+    assert_no_memory_leak([], "#{<<-'begin;'}", "#{<<-'end;'}", rss: true)
+      code = proc do
+        eval("def foo(...) super(...) {}; end")
+        raise "unreachable"
+      rescue SyntaxError
+      end
+
+      1_000.times(&code)
+    begin;
+      100_000.times(&code)
+    end;
+  end
+
   def test_class_module_Object_ancestors
     assert_separately([], <<-RUBY)
       m = Module.new

From e9e66f74e35beca05d3394a359184d1dccea5dc6 Mon Sep 17 00:00:00 2001
From: Leo Arnold <github@leoarnold.de>
Date: Tue, 15 Oct 2024 10:16:06 +0200
Subject: [PATCH 077/140] [rubygems/rubygems] Add missing comma in
 documentation

https://github.com/rubygems/rubygems/commit/fe9999f2cf
---
 lib/rubygems/specification.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index e5541e57b12d24..11facfb45c36c8 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -391,7 +391,7 @@ def licenses=(licenses)
   #     "homepage_uri"      => "https://bestgemever.example.io",
   #     "mailing_list_uri"  => "https://groups.example.com/bestgemever",
   #     "source_code_uri"   => "https://example.com/user/bestgemever",
-  #     "wiki_uri"          => "https://example.com/user/bestgemever/wiki"
+  #     "wiki_uri"          => "https://example.com/user/bestgemever/wiki",
   #     "funding_uri"       => "https://example.com/donate"
   #   }
   #

From 9d5be3d9ed87678ecbb98eede9cca95f62c03526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Mon, 14 Oct 2024 18:42:38 +0200
Subject: [PATCH 078/140] [rubygems/rubygems] Lock definition directly

https://github.com/rubygems/rubygems/commit/55eb6630a8
---
 lib/bundler/cli/check.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb
index 2adf59d5d57e22..1f568345094dba 100644
--- a/lib/bundler/cli/check.rb
+++ b/lib/bundler/cli/check.rb
@@ -32,7 +32,7 @@ def run
         Bundler.ui.error "This bundle has been frozen, but there is no #{SharedHelpers.relative_lockfile_path} present"
         exit 1
       else
-        Bundler.load.lock(preserve_unknown_sections: true) unless options[:"dry-run"]
+        definition.lock(true) unless options[:"dry-run"]
         Bundler.ui.info "The Gemfile's dependencies are satisfied"
       end
     end

From cff18256ca9a99cdb59a8f9b9f4243fb96c158f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Mon, 30 Sep 2024 18:11:17 +0200
Subject: [PATCH 079/140] [rubygems/rubygems] No reason for
 `Definition#sources` to be private

https://github.com/rubygems/rubygems/commit/432fe083a6
---
 lib/bundler/definition.rb         | 5 ++---
 lib/bundler/lockfile_generator.rb | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index bb6eb11e4eaf7f..d9b5660e1f79b3 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -19,7 +19,8 @@ class << self
       :ruby_version,
       :lockfile,
       :gemfiles,
-      :locked_checksums
+      :locked_checksums,
+      :sources
     )
 
     # Given a gemfile and lockfile creates a Bundler definition
@@ -500,8 +501,6 @@ def unlocking?
 
     private
 
-    attr_reader :sources
-
     def should_add_extra_platforms?
       !lockfile_exists? && generic_local_platform_is_ruby? && !Bundler.settings[:force_ruby_platform]
     end
diff --git a/lib/bundler/lockfile_generator.rb b/lib/bundler/lockfile_generator.rb
index a646d00ee1c409..904552fa0c8eb0 100644
--- a/lib/bundler/lockfile_generator.rb
+++ b/lib/bundler/lockfile_generator.rb
@@ -29,7 +29,7 @@ def generate!
     private
 
     def add_sources
-      definition.send(:sources).lock_sources.each_with_index do |source, idx|
+      definition.sources.lock_sources.each_with_index do |source, idx|
         out << "\n" unless idx.zero?
 
         # Add the source header

From def5fdf82ab87f17bc0bbc5f232ffa3902433e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Mon, 14 Oct 2024 22:49:05 +0200
Subject: [PATCH 080/140] [rubygems/rubygems] Delay and refactor verification
 of changed sources

https://github.com/rubygems/rubygems/commit/d5dce93167
---
 lib/bundler/definition.rb           | 12 ------------
 lib/bundler/lazy_specification.rb   | 11 +++++++++--
 lib/bundler/resolver/base.rb        |  4 ++++
 spec/bundler/resolver/basic_spec.rb |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index d9b5660e1f79b3..80a2eb47144cac 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -887,8 +887,6 @@ def converge_specs(specs)
       converged = []
       deps = []
 
-      @specs_that_changed_sources = []
-
       specs.each do |s|
         name = s.name
         dep = @dependencies.find {|d| s.satisfies?(d) }
@@ -897,7 +895,6 @@ def converge_specs(specs)
         if dep
           gemfile_source = dep.source || default_source
 
-          @specs_that_changed_sources << s if gemfile_source != lockfile_source
           deps << dep if !dep.source || lockfile_source.include?(dep.source)
           @gems_to_unlock << name if lockfile_source.include?(dep.source) && lockfile_source != gemfile_source
 
@@ -979,7 +976,6 @@ def find_source_requirements
         source_requirements["bundler"] = sources.metadata_source # needs to come last to override
       end
 
-      verify_changed_sources!
       source_requirements
     end
 
@@ -987,14 +983,6 @@ def default_source
       sources.default_source
     end
 
-    def verify_changed_sources!
-      @specs_that_changed_sources.each do |s|
-        if s.source.specs.search(s.name).empty?
-          raise GemNotFound, "Could not find gem '#{s.name}' in #{s.source}"
-        end
-      end
-    end
-
     def requested_groups
       values = groups - Bundler.settings[:without] - @optional_groups + Bundler.settings[:with]
       values &= Bundler.settings[:only] unless Bundler.settings[:only].empty?
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
index 8669e021c218e3..74f7da188f7a78 100644
--- a/lib/bundler/lazy_specification.rb
+++ b/lib/bundler/lazy_specification.rb
@@ -27,11 +27,18 @@ def initialize(name, version, platform, source = nil)
       @dependencies  = []
       @required_ruby_version = Gem::Requirement.default
       @required_rubygems_version = Gem::Requirement.default
-      @platform      = platform || Gem::Platform::RUBY
-      @source        = source
+      @platform = platform || Gem::Platform::RUBY
+
+      @original_source = source
+      @source = source
+
       @force_ruby_platform = default_force_ruby_platform
     end
 
+    def source_changed?
+      @original_source != source
+    end
+
     def full_name
       @full_name ||= if platform == Gem::Platform::RUBY
         "#{@name}-#{@version}"
diff --git a/lib/bundler/resolver/base.rb b/lib/bundler/resolver/base.rb
index 3f2436672aa780..4c2aed32de24c6 100644
--- a/lib/bundler/resolver/base.rb
+++ b/lib/bundler/resolver/base.rb
@@ -107,6 +107,10 @@ def unrestrict_names(names)
       def build_base_requirements
         base_requirements = {}
         @base.each do |ls|
+          if ls.source_changed? && ls.source.specs.search(ls.name).empty?
+            raise GemNotFound, "Could not find gem '#{ls.name}' in #{ls.source}"
+          end
+
           req = Gem::Requirement.new(ls.version)
           base_requirements[ls.name] = req
         end
diff --git a/spec/bundler/resolver/basic_spec.rb b/spec/bundler/resolver/basic_spec.rb
index f152907d35a415..0d3eadbaf8bd49 100644
--- a/spec/bundler/resolver/basic_spec.rb
+++ b/spec/bundler/resolver/basic_spec.rb
@@ -238,7 +238,7 @@
     it "resolves foo only to latest patch - changing dependency declared case" do
       # bar is locked AND a declared dependency in the Gemfile, so it will not move, and therefore
       # foo can only move up to 1.4.4.
-      @base << build_spec("bar", "2.0.3").first
+      @base << Bundler::LazySpecification.new("bar", Gem::Version.new("2.0.3"), nil)
       should_conservative_resolve_and_include :patch, ["foo"], %w[foo-1.4.4 bar-2.0.3]
     end
 

From 36b7ad3caa72bc0638d528dcb18682b94ff89b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Mon, 14 Oct 2024 23:02:23 +0200
Subject: [PATCH 081/140] [rubygems/rubygems] Fix `bundle check` sometimes
 locking gems under the wrong source

https://github.com/rubygems/rubygems/commit/1e5780db0a

Co-authored-by: Taylor Thurlow <thurlow@hey.com>
---
 lib/bundler/cli/check.rb            |  2 +-
 lib/bundler/definition.rb           |  9 ++-
 spec/bundler/commands/check_spec.rb | 87 ++++++++++++++++++++++++++---
 3 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb
index 1f568345094dba..493eb3ec6a5ad6 100644
--- a/lib/bundler/cli/check.rb
+++ b/lib/bundler/cli/check.rb
@@ -15,7 +15,7 @@ def run
       definition.validate_runtime!
 
       begin
-        definition.resolve_only_locally!
+        definition.check!
         not_installed = definition.missing_specs
       rescue GemNotFound, GitError, SolveFailure
         Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies."
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 80a2eb47144cac..66ca408c9a9ec4 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -163,7 +163,14 @@ def gem_version_promoter
       @gem_version_promoter ||= GemVersionPromoter.new
     end
 
-    def resolve_only_locally!
+    def check!
+      # If dependencies have changed, we need to resolve remotely. Otherwise,
+      # since we'll be resolving with a single local source, we may end up
+      # locking gems under the wrong source in the lockfile, and missing lockfile
+      # checksums
+      resolve_remotely! if @dependency_changes
+
+      # Now do a local only resolve, to verify if any gems are missing locally
       sources.local_only!
       resolve
     end
diff --git a/spec/bundler/commands/check_spec.rb b/spec/bundler/commands/check_spec.rb
index 18c4b2d89f4b7f..b5bb29ff4109ef 100644
--- a/spec/bundler/commands/check_spec.rb
+++ b/spec/bundler/commands/check_spec.rb
@@ -47,8 +47,8 @@
     expect(bundled_app_lock).not_to exist
   end
 
-  it "prints a generic error if the missing gems are unresolvable" do
-    system_gems ["rails-2.3.2"]
+  it "prints an error that shows missing gems" do
+    system_gems ["rails-2.3.2"], path: default_bundle_path
 
     gemfile <<-G
       source "https://gem.repo1"
@@ -56,10 +56,17 @@
     G
 
     bundle :check, raise_on_error: false
-    expect(err).to include("Bundler can't satisfy your Gemfile's dependencies.")
+    expect(err).to include("The following gems are missing")
+    expect(err).to include(" * rake (13.2.1)")
+    expect(err).to include(" * actionpack (2.3.2)")
+    expect(err).to include(" * activerecord (2.3.2)")
+    expect(err).to include(" * actionmailer (2.3.2)")
+    expect(err).to include(" * activeresource (2.3.2)")
+    expect(err).to include(" * activesupport (2.3.2)")
+    expect(err).to include("Install missing gems with `bundle install`")
   end
 
-  it "prints a generic error if a Gemfile.lock does not exist and a toplevel dependency does not exist" do
+  it "prints an error that shows missing gems if a Gemfile.lock does not exist and a toplevel dependency is missing" do
     gemfile <<-G
       source "https://gem.repo1"
       gem "rails"
@@ -67,7 +74,15 @@
 
     bundle :check, raise_on_error: false
     expect(exitstatus).to be > 0
-    expect(err).to include("Bundler can't satisfy your Gemfile's dependencies.")
+    expect(err).to include("The following gems are missing")
+    expect(err).to include(" * rails (2.3.2)")
+    expect(err).to include(" * rake (13.2.1)")
+    expect(err).to include(" * actionpack (2.3.2)")
+    expect(err).to include(" * activerecord (2.3.2)")
+    expect(err).to include(" * actionmailer (2.3.2)")
+    expect(err).to include(" * activeresource (2.3.2)")
+    expect(err).to include(" * activesupport (2.3.2)")
+    expect(err).to include("Install missing gems with `bundle install`")
   end
 
   it "prints a generic error if gem git source is not checked out" do
@@ -391,7 +406,7 @@
 
     it "returns success when the Gemfile is satisfied" do
       system_gems "myrack-1.0.0", path: default_bundle_path
-      bundle :check
+      bundle :check, artifice: "compact_index"
       expect(out).to include("The Gemfile's dependencies are satisfied")
     end
   end
@@ -416,11 +431,11 @@
 
     it "returns success when the Gemfile is satisfied and generates a correct lockfile" do
       system_gems "depends_on_myrack-1.0", "myrack-1.0", gem_repo: gem_repo4, path: default_bundle_path
-      bundle :check
+      bundle :check, artifice: "compact_index"
 
       checksums = checksums_section_when_enabled do |c|
-        c.no_checksum "depends_on_myrack", "1.0"
-        c.no_checksum "myrack", "1.0"
+        c.checksum gem_repo4, "depends_on_myrack", "1.0"
+        c.checksum gem_repo4, "myrack", "1.0"
       end
 
       expect(out).to include("The Gemfile's dependencies are satisfied")
@@ -519,6 +534,60 @@
     end
   end
 
+  context "with scoped and unscoped sources" do
+    it "does not corrupt lockfile" do
+      build_repo2 do
+        build_gem "foo"
+        build_gem "wadus"
+        build_gem("baz") {|s| s.add_dependency "wadus" }
+      end
+
+      build_repo4 do
+        build_gem "bar"
+      end
+
+      bundle "config set path.system true"
+
+      # Add all gems to ensure all gems are installed so that a bundle check
+      # would be successful
+      install_gemfile(<<-G, artifice: "compact_index_extra")
+        source "https://gem.repo2"
+
+        source "https://gem.repo4" do
+          gem "bar"
+        end
+
+        gem "foo"
+        gem "baz"
+      G
+
+      original_lockfile = lockfile
+
+      # Remove "baz" gem from the Gemfile, and bundle install again to generate
+      # a functional lockfile with no "baz" dependency or "wadus" transitive
+      # dependency
+      install_gemfile(<<-G, artifice: "compact_index_extra")
+        source "https://gem.repo2"
+
+        source "https://gem.repo4" do
+          gem "bar"
+        end
+
+        gem "foo"
+      G
+
+      # Add back "baz" gem back to the Gemfile, but _crucially_ we do not perform a
+      # bundle install
+      gemfile(gemfile + 'gem "baz"')
+
+      bundle :check, verbose: true
+
+      # Bundle check should succeed and restore the lockfile to its original
+      # state
+      expect(lockfile).to eq(original_lockfile)
+    end
+  end
+
   describe "BUNDLED WITH" do
     def lock_with(bundler_version = nil)
       lock = <<~L

From 6a49bbd73406155159d11dca17181f356bdaa4c1 Mon Sep 17 00:00:00 2001
From: Lars Kanis <lars@greiz-reinsdorf.de>
Date: Fri, 4 Oct 2024 22:30:02 +0200
Subject: [PATCH 082/140] [ruby/win32-registry] Move all tests to volatile
 environment and use per-test individual registry key

This allows to run all tests in parallel.
Usage of `File` methods is avoided.
Since all tests are executed in the volatile environment of the registry,
the dedicated 'create_volatile' test is removed now.
Also add some documentation to the test setup.

Downside of this use of the "Volatile Environment" is that we can not use or test
the `create` method with default options.
This is because within this path only keys with option `REG_OPTION_VOLATILE` are allowed.

https://github.com/ruby/win32-registry/commit/3c186ae7dd
---
 test/win32/test_registry.rb | 104 ++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 47 deletions(-)

diff --git a/test/win32/test_registry.rb b/test/win32/test_registry.rb
index 8a98405a79ec1e..a4fa37402f44a8 100644
--- a/test/win32/test_registry.rb
+++ b/test/win32/test_registry.rb
@@ -12,18 +12,38 @@
 if defined?(Win32::Registry)
   class TestWin32Registry < Test::Unit::TestCase
     COMPUTERNAME = 'SYSTEM\\CurrentControlSet\\Control\\ComputerName\\ComputerName'
-
-    private def backslachs(path)
-      path.gsub("/", "\\")
+    TEST_REGISTRY_PATH = 'Volatile Environment'
+    TEST_REGISTRY_KEY = 'ruby-win32-registry-test-<RND>'
+
+    # Create a new registry key per test in an atomic way, which is deleted on teardown.
+    #
+    # Fills the following instance variables:
+    #
+    #   @test_registry_key - A registry path which is not yet created,
+    #                        but can be created without collisions even when running
+    #                        multiple test processes.
+    #   @test_registry_rnd - The part of the registry path with a random number.
+    #   @createopts        - Required parameters (desired, opt) for create method in
+    #                        the volatile environment of the registry.
+    def setup
+      @createopts = [Win32::Registry::KEY_ALL_ACCESS, Win32::Registry::REG_OPTION_VOLATILE]
+      100.times do |i|
+        k = TEST_REGISTRY_KEY.gsub("<RND>", i.to_s)
+        next unless Win32::Registry::HKEY_CURRENT_USER.create(
+          TEST_REGISTRY_PATH + "\\" + k,
+          *@createopts
+        ).created?
+        @test_registry_key = TEST_REGISTRY_PATH + "\\" + k + "\\" + "test\\"
+        @test_registry_rnd = k
+        break
+      end
+      omit "Unused registry subkey not found in #{TEST_REGISTRY_KEY}" unless @test_registry_key
     end
 
-    TEST_REGISTRY_KEY = "SOFTWARE/ruby-win32-registry-test/"
-
-    def setup
-      Win32::Registry::HKEY_CURRENT_USER.open(backslachs(File.dirname(TEST_REGISTRY_KEY))) do |reg|
-        reg.delete_key File.basename(TEST_REGISTRY_KEY), true
+    def teardown
+      Win32::Registry::HKEY_CURRENT_USER.open(TEST_REGISTRY_PATH) do |reg|
+        reg.delete_key @test_registry_rnd, true
       end
-    rescue Win32::Registry::Error
     end
 
     def test_predefined
@@ -39,9 +59,9 @@ def test_predefined
     end
 
     def test_open_no_block
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)).close
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts).close
 
-      reg = Win32::Registry::HKEY_CURRENT_USER.open(backslachs(TEST_REGISTRY_KEY), Win32::Registry::KEY_ALL_ACCESS)
+      reg = Win32::Registry::HKEY_CURRENT_USER.open(@test_registry_key, Win32::Registry::KEY_ALL_ACCESS)
       assert_kind_of Win32::Registry, reg
       assert_equal true, reg.open?
       assert_equal false, reg.created?
@@ -53,10 +73,10 @@ def test_open_no_block
     end
 
     def test_open_with_block
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)).close
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts).close
 
       regs = []
-      Win32::Registry::HKEY_CURRENT_USER.open(backslachs(TEST_REGISTRY_KEY), Win32::Registry::KEY_ALL_ACCESS) do |reg|
+      Win32::Registry::HKEY_CURRENT_USER.open(@test_registry_key, Win32::Registry::KEY_ALL_ACCESS) do |reg|
         regs << reg
         assert_equal true, reg.open?
         assert_equal false, reg.created?
@@ -92,17 +112,8 @@ def test_read
       end
     end
 
-    def test_create_volatile
-      desired = Win32::Registry::KEY_ALL_ACCESS
-      option = Win32::Registry::REG_OPTION_VOLATILE
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY), desired) do |reg|
-        reg.create("volkey", desired, option) {}
-        reg.delete_key("volkey", true)
-      end
-    end
-
     def test_create_no_block
-      reg = Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY))
+      reg = Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts)
       assert_kind_of Win32::Registry, reg
       assert_equal true, reg.open?
       assert_equal true, reg.created?
@@ -116,7 +127,7 @@ def test_create_no_block
 
     def test_create_with_block
       regs = []
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
         regs << reg
         reg["test"] = "abc"
         assert_equal true, reg.open?
@@ -132,8 +143,7 @@ def test_create_with_block
     end
 
     def test_write
-      desired = Win32::Registry::KEY_ALL_ACCESS
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY), desired) do |reg|
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
         reg.write_s("key1", "data")
         assert_equal [Win32::Registry::REG_SZ, "data"], reg.read("key1")
         reg.write_i("key2", 0x5fe79027)
@@ -142,32 +152,32 @@ def test_write
     end
 
     def test_accessors
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
         assert_kind_of Integer, reg.hkey
         assert_kind_of Win32::Registry, reg.parent
         assert_equal "HKEY_CURRENT_USER", reg.parent.name
-        assert_equal "SOFTWARE\\ruby-win32-registry-test\\", reg.keyname
+        assert_equal "Volatile Environment\\#{@test_registry_rnd}\\test\\", reg.keyname
         assert_equal Win32::Registry::REG_CREATED_NEW_KEY, reg.disposition
       end
     end
 
     def test_name
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        assert_equal "HKEY_CURRENT_USER\\SOFTWARE\\ruby-win32-registry-test\\", reg.name
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        assert_equal "HKEY_CURRENT_USER\\Volatile Environment\\#{@test_registry_rnd}\\test\\", reg.name
       end
     end
 
     def test_keys
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        reg.create("key1")
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
         assert_equal ["key1"], reg.keys
       end
     end
 
     def test_each_key
       keys = []
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        reg.create("key1")
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
         reg.each_key { |*a| keys << a }
       end
       assert_equal [2], keys.map(&:size)
@@ -177,10 +187,10 @@ def test_each_key
 
     def test_each_key_enum
       keys = nil
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        reg.create("key1")
-        reg.create("key2")
-        reg.create("key3")
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
+        reg.create("key2", *@createopts)
+        reg.create("key3", *@createopts)
         reg["value1"] = "abcd"
         keys = reg.each_key.to_a
       end
@@ -190,8 +200,8 @@ def test_each_key_enum
     end
 
     def test_values
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        reg.create("key1")
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
         reg["value1"] = "abcd"
         assert_equal ["abcd"], reg.values
       end
@@ -199,8 +209,8 @@ def test_values
 
     def test_each_value
       vals = []
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        reg.create("key1")
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
         reg["value1"] = "abcd"
         reg.each_value { |*a| vals << a }
       end
@@ -209,8 +219,8 @@ def test_each_value
 
     def test_each_value_enum
       vals = nil
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        reg.create("key1")
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("key1", *@createopts)
         reg["value1"] = "abcd"
         reg["value2"] = 42
         vals = reg.each_value.to_a
@@ -221,9 +231,9 @@ def test_each_value_enum
 
     def test_utf8_encoding
       keys = []
-      Win32::Registry::HKEY_CURRENT_USER.create(backslachs(TEST_REGISTRY_KEY)) do |reg|
-        reg.create("abc EUR")
-        reg.create("abc €")
+      Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg|
+        reg.create("abc EUR", *@createopts)
+        reg.create("abc €", *@createopts)
         reg.each_key do |subkey|
           keys << subkey
         end

From 85ce3b177cf0b4749a8328c7b509ec27b2f02da0 Mon Sep 17 00:00:00 2001
From: Lars Kanis <kanis@comcard.de>
Date: Fri, 11 Oct 2024 22:41:09 +0200
Subject: [PATCH 083/140] [ruby/win32-registry] Fix compatibility with JRuby

JRuby's fiddle implementation has quite some shortcomings compared with the CRuby impl.
Add JRuby tests in CI.

https://github.com/ruby/win32-registry/commit/7f34184c2e
---
 ext/win32/lib/win32/registry.rb | 33 ++++++++++++++++++---------------
 test/win32/test_registry.rb     |  4 +++-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb
index e84653d9459455..d0cbb6afcfce9d 100644
--- a/ext/win32/lib/win32/registry.rb
+++ b/ext/win32/lib/win32/registry.rb
@@ -178,7 +178,7 @@ def initialize(code)
         buff = WCHAR_NUL * 1024
         lang = 0
         begin
-          len = FormatMessageW.call(0x1200, 0, code, lang, buff, 1024, 0)
+          len = FormatMessageW.call(0x1200, nil, code, lang, buff, 1024, nil)
           msg = buff.byteslice(0, len * WCHAR_SIZE)
           msg.delete!(WCHAR_CR)
           msg.chomp!
@@ -198,7 +198,7 @@ def initialize(code)
     #
     class PredefinedKey < Registry
       def initialize(hkey, keyname)
-        @hkey = hkey
+        @hkey = Fiddle::Pointer.new(hkey)
         @parent = nil
         @keyname = keyname
         @disposition = REG_OPENED_EXISTING_KEY
@@ -238,7 +238,7 @@ module API
         "long RegDeleteKeyW(void *, void *)",
         "long RegFlushKey(void *)",
         "long RegCloseKey(void *)",
-        "long RegQueryInfoKey(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
+        "long RegQueryInfoKeyW(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)",
       ].each do |fn|
         cfunc = extern fn, :stdcall
         const_set cfunc.name.intern, cfunc
@@ -285,7 +285,7 @@ def unpackqw(qw)
       end
 
       def make_wstr(str)
-        str.encode(WCHAR)
+        (str+"\0").encode(WCHAR)
       end
 
       def OpenKey(hkey, name, opt, desired)
@@ -298,14 +298,14 @@ def CreateKey(hkey, name, opt, desired)
         result = packhandle(0)
         disp = packdw(0)
         check RegCreateKeyExW.call(hkey, make_wstr(name), 0, 0, opt, desired,
-                                   0, result, disp)
+                                   nil, result, disp)
         [ unpackhandle(result), unpackdw(disp) ]
       end
 
       def EnumValue(hkey, index)
         name = WCHAR_NUL * Constants::MAX_KEY_LENGTH
         size = packdw(Constants::MAX_KEY_LENGTH)
-        check RegEnumValueW.call(hkey, index, name, size, 0, 0, 0, 0)
+        check RegEnumValueW.call(hkey, index, name, size, nil, nil, nil, nil)
         name.byteslice(0, unpackdw(size) * WCHAR_SIZE)
       end
 
@@ -313,7 +313,7 @@ def EnumKey(hkey, index)
         name = WCHAR_NUL * Constants::MAX_KEY_LENGTH
         size = packdw(Constants::MAX_KEY_LENGTH)
         wtime = ' ' * 8
-        check RegEnumKeyExW.call(hkey, index, name, size, 0, 0, 0, wtime)
+        check RegEnumKeyExW.call(hkey, index, name, size, nil, nil, nil, wtime)
         [ name.byteslice(0, unpackdw(size) * WCHAR_SIZE), unpackqw(wtime) ]
       end
 
@@ -321,9 +321,9 @@ def QueryValue(hkey, name)
         type = packdw(0)
         size = packdw(0)
         name = make_wstr(name)
-        check RegQueryValueExW.call(hkey, name, 0, type, 0, size)
+        check RegQueryValueExW.call(hkey, name, nil, type, nil, size)
         data = "\0".b * unpackdw(size)
-        check RegQueryValueExW.call(hkey, name, 0, type, data, size)
+        check RegQueryValueExW.call(hkey, name, nil, type, data, size)
         [ unpackdw(type), data[0, unpackdw(size)] ]
       end
 
@@ -360,7 +360,7 @@ def QueryInfoKey(hkey)
         maxvaluelen = packdw(0)
         secdescs = packdw(0)
         wtime = ' ' * 8
-        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
+        check RegQueryInfoKeyW.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
           values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
         [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
           unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
@@ -430,7 +430,7 @@ def self.time2wtime(time)
     # If block is given, the key is closed automatically.
     def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
       subkey = subkey.chomp('\\')
-      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
+      newkey = API.OpenKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired)
       obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
       if block_given?
         begin
@@ -457,7 +457,7 @@ def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
     # If block is given, the key is closed automatically.
     #
     def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
+      newkey, disp = API.CreateKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired)
       obj = new(newkey, hkey, subkey, disp)
       if block_given?
         begin
@@ -479,7 +479,7 @@ def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVE
     # initialize
     #
     def initialize(hkey, parent, keyname, disposition)
-      @hkey = hkey
+      @hkey = Fiddle::Pointer.new(hkey)
       @parent = parent
       @keyname = keyname
       @disposition = disposition
@@ -487,8 +487,6 @@ def initialize(hkey, parent, keyname, disposition)
       ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
     end
 
-    #  Returns key handle value.
-    attr_reader :hkey
     # Win32::Registry object of parent key, or nil if predefeined key.
     attr_reader :parent
     # Same as subkey value of Registry.open or
@@ -497,6 +495,11 @@ def initialize(hkey, parent, keyname, disposition)
     #  Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
     attr_reader :disposition
 
+    #  Returns key handle value.
+    def hkey
+      @hkey.to_i
+    end
+
     #
     # Returns if key is created ((*newly*)).
     # (see Registry.create) -- basically you call create
diff --git a/test/win32/test_registry.rb b/test/win32/test_registry.rb
index a4fa37402f44a8..9a38d0d314cff9 100644
--- a/test/win32/test_registry.rb
+++ b/test/win32/test_registry.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
+require "rbconfig"
+
+if /mswin|mingw|cygwin/ =~ RbConfig::CONFIG['host_os']
   begin
     require 'win32/registry'
   rescue LoadError

From 34d800ebcdded37e55743bda79a2050c58ca135a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 17 Oct 2024 11:12:09 +0900
Subject: [PATCH 084/140] [ruby/win32-registry] Exclude mailmap from packages
 [ci skip]

https://github.com/ruby/win32-registry/commit/521f93af9e
---
 ext/win32/win32-registry.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/win32/win32-registry.gemspec b/ext/win32/win32-registry.gemspec
index b6df247574a3f5..cbac30f2217acc 100644
--- a/ext/win32/win32-registry.gemspec
+++ b/ext/win32/win32-registry.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
       (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git .github appveyor Gemfile])
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git .github .mailmap appveyor Gemfile])
     end
   end
   spec.bindir = "exe"

From 72b8fa9e03f74ddfa9b32f2916813728c0692615 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 17 Oct 2024 12:06:41 +0900
Subject: [PATCH 085/140] [ruby/win32-registry] Exclude rake files from
 packages [ci skip]

https://github.com/ruby/win32-registry/commit/e7b2eeb885
---
 ext/win32/win32-registry.gemspec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/win32/win32-registry.gemspec b/ext/win32/win32-registry.gemspec
index cbac30f2217acc..ac5ff103d35c01 100644
--- a/ext/win32/win32-registry.gemspec
+++ b/ext/win32/win32-registry.gemspec
@@ -15,10 +15,13 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  excludes = %w[
+    bin/ test/ spec/ features/ rakelib/
+    .git .github .mailmap appveyor Rakefile Gemfile
+  ]
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git .github .mailmap appveyor Gemfile])
+      File.identical?(f, __FILE__) || f.start_with?(*excludes)
     end
   end
   spec.bindir = "exe"

From 817f2cc17270d0f317d071a59eec41dbfe27349e Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 17 Oct 2024 14:33:55 +0900
Subject: [PATCH 086/140] Re-ordered Stdlib updates section

---
 NEWS.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 61e7bc790a5bfb..7e05a8e7d0efdc 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -59,10 +59,6 @@ Note: We're only listing outstanding class updates.
 
 ## Stdlib updates
 
-The following default gem is added.
-
-* win32-registry 0.0.1
-
 * Tempfile
 
     * The keyword argument `anonymous: true` is implemented for Tempfile.create.
@@ -75,6 +71,10 @@ The following default gem is added.
     * This library is now extracted from the Ruby repository to [ruby/net-http-sspi].
       [[Feature #20775]]
 
+The following default gem is added.
+
+* win32-registry 0.0.1
+
 The following default gems are updated.
 
 * RubyGems 3.6.0.dev
@@ -98,6 +98,10 @@ The following default gems are updated.
 * uri 0.13.1
 * zlib 3.1.1
 
+The following bundled gem is added.
+
+* repl_type_completor 0.1.7
+
 The following bundled gems are updated.
 
 * minitest 5.25.1
@@ -129,10 +133,6 @@ The following bundled gems are promoted from default gems.
 * syslog 0.1.2
 * csv 3.3.0
 
-The following bundled gem is added.
-
-* repl_type_completor 0.1.7
-
 See GitHub releases like [GitHub Releases of Logger] or changelog for
 details of the default gems or bundled gems.
 

From d4a18d4a78faff703b553e707704a9e997194c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Tue, 3 Sep 2024 18:03:16 +0200
Subject: [PATCH 087/140] [rubygems/rubygems] Allow using `gemspec` DSL twice
 with same dependency and compatible requirements

https://github.com/rubygems/rubygems/commit/a8d14c1fc2
---
 lib/bundler/dsl.rb                    | 46 ++++++++++++++-------
 spec/bundler/commands/install_spec.rb | 57 +++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 24a9a7683a3d4a..df904f074adea5 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -110,9 +110,23 @@ def gem(name, *args)
           if gemspec_dep
             gemfile_dep = [dep, current].find(&:runtime?)
 
-            unless current_requirement_open
+            if gemfile_dep && !current_requirement_open
               Bundler.ui.warn "A gemspec development dependency (#{gemspec_dep.name}, #{gemspec_dep.requirement}) is being overridden by a Gemfile dependency (#{gemfile_dep.name}, #{gemfile_dep.requirement}).\n" \
                               "This behaviour may change in the future. Please remove either of them, or make sure they both have the same requirement\n"
+            elsif gemfile_dep.nil?
+              require_relative "vendor/pub_grub/lib/pub_grub/version_range"
+              require_relative "vendor/pub_grub/lib/pub_grub/version_constraint"
+              require_relative "vendor/pub_grub/lib/pub_grub/version_union"
+              require_relative "vendor/pub_grub/lib/pub_grub/rubygems"
+
+              current_gemspec_range = PubGrub::RubyGems.requirement_to_range(current.requirement)
+              next_gemspec_range = PubGrub::RubyGems.requirement_to_range(dep.requirement)
+
+              if current_gemspec_range.intersects?(next_gemspec_range)
+                dep = Dependency.new(name, current.requirement.as_list + dep.requirement.as_list, options)
+              else
+                raise GemfileError, "Two gemspecs have conflicting requirements on the same gem: #{dep} and #{current}"
+              end
             end
           else
             update_prompt = ""
@@ -133,20 +147,22 @@ def gem(name, *args)
           end
         end
 
-        # Always prefer the dependency from the Gemfile
-        if current.gemspec_dev_dep?
-          @dependencies.delete(current)
-        elsif dep.gemspec_dev_dep?
-          return
-        elsif current.source != dep.source
-          raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
-                          "You specified that #{dep.name} (#{dep.requirement}) should come from " \
-                          "#{current.source || "an unspecified source"} and #{dep.source}\n"
-        else
-          Bundler.ui.warn "Your Gemfile lists the gem #{current.name} (#{current.requirement}) more than once.\n" \
-                          "You should probably keep only one of them.\n" \
-                          "Remove any duplicate entries and specify the gem only once.\n" \
-                          "While it's not a problem now, it could cause errors if you change the version of one of them later."
+        unless current.gemspec_dev_dep? && dep.gemspec_dev_dep?
+          # Always prefer the dependency from the Gemfile
+          if current.gemspec_dev_dep?
+            @dependencies.delete(current)
+          elsif dep.gemspec_dev_dep?
+            return
+          elsif current.source != dep.source
+            raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
+                            "You specified that #{dep.name} (#{dep.requirement}) should come from " \
+                            "#{current.source || "an unspecified source"} and #{dep.source}\n"
+          else
+            Bundler.ui.warn "Your Gemfile lists the gem #{current.name} (#{current.requirement}) more than once.\n" \
+                            "You should probably keep only one of them.\n" \
+                            "Remove any duplicate entries and specify the gem only once.\n" \
+                            "While it's not a problem now, it could cause errors if you change the version of one of them later."
+          end
         end
       end
 
diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb
index 19711045c20fd4..e8678187d0e69a 100644
--- a/spec/bundler/commands/install_spec.rb
+++ b/spec/bundler/commands/install_spec.rb
@@ -485,6 +485,63 @@
       expect(the_bundle).to include_gems("rubocop 1.36.0")
     end
 
+    it "includes the gem without warning if two gemspecs add it with compatible requirements" do
+      gem1 = tmp("my-gem-1")
+      gem2 = tmp("my-gem-2")
+
+      build_lib "my-gem", path: gem1 do |s|
+        s.add_development_dependency "rubocop", "~> 1.0"
+      end
+
+      build_lib "my-gem-2", path: gem2 do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec path: "#{gem1}"
+        gemspec path: "#{gem2}"
+      G
+
+      bundle :install
+
+      expect(err).to be_empty
+      expect(the_bundle).to include_gems("rubocop 1.36.0")
+    end
+
+    it "errors out if two gemspecs add it with incompatible requirements" do
+      gem1 = tmp("my-gem-1")
+      gem2 = tmp("my-gem-2")
+
+      build_lib "my-gem", path: gem1 do |s|
+        s.add_development_dependency "rubocop", "~> 2.0"
+      end
+
+      build_lib "my-gem-2", path: gem2 do |s|
+        s.add_development_dependency "rubocop", "~> 1.36.0"
+      end
+
+      build_repo4 do
+        build_gem "rubocop", "1.36.0"
+      end
+
+      gemfile <<~G
+        source "https://gem.repo4"
+
+        gemspec path: "#{gem1}"
+        gemspec path: "#{gem2}"
+      G
+
+      bundle :install, raise_on_error: false
+
+      expect(err).to include("Two gemspecs have conflicting requirements on the same gem: rubocop (~> 1.36.0, development) and rubocop (~> 2.0, development). Bundler cannot continue.")
+    end
+
     it "warns when a Gemfile dependency is overriding a gemspec development dependency, with different requirements" do
       build_lib "my-gem", path: bundled_app do |s|
         s.add_development_dependency "rails", ">= 5"

From 9da60a14bf7e83f837c1be2c463bba059a9600ff Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 17 Oct 2024 16:28:51 +0900
Subject: [PATCH 088/140] [ruby/etc] Fix sysconfdir when load-relative

When relative load paths option is enabled, the prefix is determined
at the runtime.  The only way to get it outside libruby is to use
rbconfig.rb.

https://github.com/ruby/etc/commit/e5b498fad9
---
 ext/etc/etc.c        | 12 ++++++++++++
 test/etc/test_etc.rb |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index fcbd1af1b5cc6c..6c08088710e26d 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -691,6 +691,16 @@ etc_getgrent(VALUE obj)
 VALUE rb_w32_special_folder(int type);
 UINT rb_w32_system_tmpdir(WCHAR *path, UINT len);
 VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
+#elif defined(LOAD_RELATIVE)
+static inline VALUE
+rbconfig(void)
+{
+    VALUE config;
+    rb_require("rbconfig");
+    config = rb_const_get(rb_path2class("RbConfig"), rb_intern("CONFIG"));
+    Check_Type(config, T_HASH);
+    return config;
+}
 #endif
 
 /* call-seq:
@@ -710,6 +720,8 @@ etc_sysconfdir(VALUE obj)
 {
 #ifdef _WIN32
     return rb_w32_special_folder(CSIDL_COMMON_APPDATA);
+#elif defined(LOAD_RELATIVE)
+    return rb_hash_aref(rbconfig(), rb_str_new_lit("sysconfdir"));
 #else
     return rb_filesystem_str_new_cstr(SYSCONFDIR);
 #endif
diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb
index 2eddcf49d732e8..c15c4f6e1e7b2c 100644
--- a/test/etc/test_etc.rb
+++ b/test/etc/test_etc.rb
@@ -169,6 +169,10 @@ def test_nprocessors
     assert_operator(1, :<=, n)
   end
 
+  def test_sysconfdir
+    assert_operator(File, :absolute_path?, Etc.sysconfdir)
+  end if File.method_defined?(:absolute_path?)
+
   def test_ractor
     return unless Etc.passwd # => skip test if no platform support
     Etc.endpwent

From 681787d11f2d71790cec4b2094086e2bb6629ac9 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 17 Oct 2024 16:33:02 +0900
Subject: [PATCH 089/140] [ruby/syntax_suggest] Fallback to load
 syntax_suggest/api when failing to load with require_relative.

https://github.com/ruby/syntax_suggest/commit/b782897560
---
 libexec/syntax_suggest | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libexec/syntax_suggest b/libexec/syntax_suggest
index e4a0b0b658e67f..a54c690d2b2a8b 100755
--- a/libexec/syntax_suggest
+++ b/libexec/syntax_suggest
@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 
-require_relative "../lib/syntax_suggest/api"
+begin
+  require_relative "../lib/syntax_suggest/api"
+rescue LoadError
+  # for default gems
+  require "syntax_suggest/api"
+end
 
 SyntaxSuggest::Cli.new(
   argv: ARGV

From 7962b4c342dbf7f71be61ca4b37baf815fd4c0e6 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 16:57:00 +0900
Subject: [PATCH 090/140] [ruby/json] Use `RARRAY_AREF` instead of
 `rb_ary_entry` to improve performance

It is safe to use `RARRAY_AREF` here because no Ruby code is executed
between `RARRAY_LEN` and `RARRAY_AREF`.

This speeds up `JSON.generate` by about 4% in a benchmark.

https://github.com/ruby/json/commit/c5d80f9fd4
---
 ext/json/generator/generator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 50fcb77bdfccc4..89c4b87cb5c5a2 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -743,7 +743,7 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
                 fbuffer_append(buffer, indent, indent_len);
             }
         }
-        generate_json(buffer, Vstate, state, rb_ary_entry(obj, i));
+        generate_json(buffer, Vstate, state, RARRAY_AREF(obj, i));
     }
     state->depth = --depth;
     if (array_nl) {

From 3911189fba46714eec886452b934258e001dd12b Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 16:51:04 +0900
Subject: [PATCH 091/140] [ruby/json] Use efficient object-type dispatching

Dispatching based on Ruby's VALUE structure is more efficient than
simply cascaded "if ... else if ..." checks.

This speeds up `JSON.generate` by about 5% in a benchmark.

https://github.com/ruby/json/commit/4f9180debb
---
 ext/json/generator/generator.c | 67 ++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 89c4b87cb5c5a2..92fd33369f479e 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -827,35 +827,56 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
 static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
     VALUE tmp;
-    VALUE klass = CLASS_OF(obj);
-    if (klass == rb_cHash) {
-        generate_json_object(buffer, Vstate, state, obj);
-    } else if (klass == rb_cArray) {
-        generate_json_array(buffer, Vstate, state, obj);
-    } else if (klass == rb_cString) {
-        generate_json_string(buffer, Vstate, state, obj);
-    } else if (obj == Qnil) {
+    if (obj == Qnil) {
         generate_json_null(buffer, Vstate, state, obj);
     } else if (obj == Qfalse) {
         generate_json_false(buffer, Vstate, state, obj);
     } else if (obj == Qtrue) {
         generate_json_true(buffer, Vstate, state, obj);
-    } else if (FIXNUM_P(obj)) {
-        generate_json_fixnum(buffer, Vstate, state, obj);
-    } else if (RB_TYPE_P(obj, T_BIGNUM)) {
-        generate_json_bignum(buffer, Vstate, state, obj);
-    } else if (klass == rb_cFloat) {
-        generate_json_float(buffer, Vstate, state, obj);
-    } else if (state->strict) {
-        rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(CLASS_OF(obj)));
-    } else if (rb_respond_to(obj, i_to_json)) {
-        tmp = rb_funcall(obj, i_to_json, 1, Vstate);
-        Check_Type(tmp, T_STRING);
-        fbuffer_append_str(buffer, tmp);
+    } else if (RB_SPECIAL_CONST_P(obj)) {
+        if (RB_FIXNUM_P(obj)) {
+            generate_json_fixnum(buffer, Vstate, state, obj);
+        } else if (RB_FLONUM_P(obj)) {
+            generate_json_float(buffer, Vstate, state, obj);
+        } else {
+            goto general;
+        }
     } else {
-        tmp = rb_funcall(obj, i_to_s, 0);
-        Check_Type(tmp, T_STRING);
-        generate_json_string(buffer, Vstate, state, tmp);
+        VALUE klass = RBASIC_CLASS(obj);
+        switch (RB_BUILTIN_TYPE(obj)) {
+            case T_BIGNUM:
+                generate_json_bignum(buffer, Vstate, state, obj);
+                break;
+            case T_HASH:
+                if (klass != rb_cHash) goto general;
+                generate_json_object(buffer, Vstate, state, obj);
+                break;
+            case T_ARRAY:
+                if (klass != rb_cArray) goto general;
+                generate_json_array(buffer, Vstate, state, obj);
+                break;
+            case T_STRING:
+                if (klass != rb_cString) goto general;
+                generate_json_string(buffer, Vstate, state, obj);
+                break;
+            case T_FLOAT:
+                if (klass != rb_cFloat) goto general;
+                generate_json_float(buffer, Vstate, state, obj);
+                break;
+            default:
+            general:
+                if (state->strict) {
+                    rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(CLASS_OF(obj)));
+                } else if (rb_respond_to(obj, i_to_json)) {
+                    tmp = rb_funcall(obj, i_to_json, 1, Vstate);
+                    Check_Type(tmp, T_STRING);
+                    fbuffer_append_str(buffer, tmp);
+                } else {
+                    tmp = rb_funcall(obj, i_to_s, 0);
+                    Check_Type(tmp, T_STRING);
+                    generate_json_string(buffer, Vstate, state, tmp);
+                }
+        }
     }
 }
 

From fb84aa550183dd923d287779c242a12f81e17493 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 16:55:03 +0900
Subject: [PATCH 092/140] [ruby/json] Directly use `generate_json_string` for
 object keys

... instead of `generate_json`.

Since the object key is already confirmed to be a string, using a
generic dispatch function brings an unnecessary overhead.

This speeds up `JSON.generate` by about 3% in a benchmark.

https://github.com/ruby/json/commit/e125072130
---
 ext/json/generator/generator.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 92fd33369f479e..3100e985f80b68 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -1,6 +1,10 @@
 #include "../fbuffer/fbuffer.h"
 #include "generator.h"
 
+#ifndef RB_UNLIKELY
+#define RB_UNLIKELY(cond) (cond)
+#endif
+
 static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
              mHash, mArray,
 #ifdef RUBY_INTEGER_UNIFICATION
@@ -678,7 +682,7 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
             break;
     }
 
-    generate_json(buffer, Vstate, state, key_to_s);
+    generate_json_string(buffer, Vstate, state, key_to_s);
     fbuffer_append(buffer, delim2, delim2_len);
     generate_json(buffer, Vstate, state, val);
 

From 88719fb300e0c6f5d8269224a3322e9871ad29b2 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 15:45:09 +0900
Subject: [PATCH 093/140] [ruby/json] Stop prebuilding array_delim

The purpose of this change is to exploit `fbuffer_append_char` that is
faster than `fbuffer_append`.

`array_delim` was a buffer that concatenated a single comma with
`array_nl`. However, in the typical use case (`JSON.generate(data)`),
`array_nl` is empty. This means that `array_delim` was a
single-character buffer in many cases.

`fbuffer_append(buffer, array_delim)` used `memcpy` to copy one byte,
which was not so efficient.
Rather, this change uses `fbuffer_append_char(buffer, ',')` and then
`fbuffer_append(buffer, array_nl)` only when `array_nl` is not NULL.

This speeds up `JSON.generate` by about 9% in a benchmark.

https://github.com/ruby/json/commit/445de6e459
---
 ext/json/generator/generator.c | 17 ++++-------------
 ext/json/generator/generator.h |  1 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 3100e985f80b68..c0efb78e1877ea 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -421,7 +421,6 @@ static void State_free(void *ptr)
     if (state->space_before) ruby_xfree(state->space_before);
     if (state->object_nl) ruby_xfree(state->object_nl);
     if (state->array_nl) ruby_xfree(state->array_nl);
-    if (state->array_delim) fbuffer_free(state->array_delim);
     if (state->object_delim) fbuffer_free(state->object_delim);
     if (state->object_delim2) fbuffer_free(state->object_delim2);
     ruby_xfree(state);
@@ -436,7 +435,6 @@ static size_t State_memsize(const void *ptr)
     if (state->space_before) size += state->space_before_len + 1;
     if (state->object_nl) size += state->object_nl_len + 1;
     if (state->array_nl) size += state->array_nl_len + 1;
-    if (state->array_delim) size += FBUFFER_CAPA(state->array_delim);
     if (state->object_delim) size += FBUFFER_CAPA(state->object_delim);
     if (state->object_delim2) size += FBUFFER_CAPA(state->object_delim2);
     return size;
@@ -731,8 +729,6 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     char *indent = state->indent;
     long indent_len = state->indent_len;
     long max_nesting = state->max_nesting;
-    char *delim = FBUFFER_PTR(state->array_delim);
-    long delim_len = FBUFFER_LEN(state->array_delim);
     long depth = ++state->depth;
     int i, j;
     if (max_nesting != 0 && depth > max_nesting) {
@@ -741,7 +737,10 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     fbuffer_append_char(buffer, '[');
     if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len);
     for(i = 0; i < RARRAY_LEN(obj); i++) {
-        if (i > 0) fbuffer_append(buffer, delim, delim_len);
+        if (i > 0) {
+            fbuffer_append_char(buffer, ',');
+            if (RB_UNLIKELY(state->array_nl)) fbuffer_append(buffer, state->array_nl, state->array_nl_len);
+        }
         if (indent) {
             for (j = 0; j < depth; j++) {
                 fbuffer_append(buffer, indent, indent_len);
@@ -905,13 +904,6 @@ static FBuffer *cState_prepare_buffer(VALUE self)
     fbuffer_append_char(state->object_delim2, ':');
     if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len);
 
-    if (state->array_delim) {
-        fbuffer_clear(state->array_delim);
-    } else {
-        state->array_delim = fbuffer_alloc(16);
-    }
-    fbuffer_append_char(state->array_delim, ',');
-    if (state->array_nl) fbuffer_append(state->array_delim, state->array_nl, state->array_nl_len);
     return buffer;
 }
 
@@ -1024,7 +1016,6 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
     objState->space_before = fstrndup(origState->space_before, origState->space_before_len);
     objState->object_nl = fstrndup(origState->object_nl, origState->object_nl_len);
     objState->array_nl = fstrndup(origState->array_nl, origState->array_nl_len);
-    if (origState->array_delim) objState->array_delim = fbuffer_dup(origState->array_delim);
     if (origState->object_delim) objState->object_delim = fbuffer_dup(origState->object_delim);
     if (origState->object_delim2) objState->object_delim2 = fbuffer_dup(origState->object_delim2);
     return obj;
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 03709447ff7a4a..b1a19df73072ae 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -55,7 +55,6 @@ typedef struct JSON_Generator_StateStruct {
     long object_nl_len;
     char *array_nl;
     long array_nl_len;
-    FBuffer *array_delim;
     FBuffer *object_delim;
     FBuffer *object_delim2;
     long max_nesting;

From 186e77209e74c3f7643ae6396ad3dbba8a5c6977 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 15:48:17 +0900
Subject: [PATCH 094/140] [ruby/json] Stop prebuilding object_delim

This speeds up `JSON.generate` by about 4% in a benchmark

https://github.com/ruby/json/commit/ed47a10e4f
---
 ext/json/generator/generator.c | 13 +------------
 ext/json/generator/generator.h |  1 -
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index c0efb78e1877ea..3432317ad8905c 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -421,7 +421,6 @@ static void State_free(void *ptr)
     if (state->space_before) ruby_xfree(state->space_before);
     if (state->object_nl) ruby_xfree(state->object_nl);
     if (state->array_nl) ruby_xfree(state->array_nl);
-    if (state->object_delim) fbuffer_free(state->object_delim);
     if (state->object_delim2) fbuffer_free(state->object_delim2);
     ruby_xfree(state);
 }
@@ -435,7 +434,6 @@ static size_t State_memsize(const void *ptr)
     if (state->space_before) size += state->space_before_len + 1;
     if (state->object_nl) size += state->object_nl_len + 1;
     if (state->array_nl) size += state->array_nl_len + 1;
-    if (state->object_delim) size += FBUFFER_CAPA(state->object_delim);
     if (state->object_delim2) size += FBUFFER_CAPA(state->object_delim2);
     return size;
 }
@@ -650,14 +648,12 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
     long object_nl_len = state->object_nl_len;
     char *indent = state->indent;
     long indent_len = state->indent_len;
-    char *delim = FBUFFER_PTR(state->object_delim);
-    long delim_len = FBUFFER_LEN(state->object_delim);
     char *delim2 = FBUFFER_PTR(state->object_delim2);
     long delim2_len = FBUFFER_LEN(state->object_delim2);
     long depth = state->depth;
     int j;
 
-    if (arg->iter > 0) fbuffer_append(buffer, delim, delim_len);
+    if (arg->iter > 0) fbuffer_append_char(buffer, ',');
     if (object_nl) {
         fbuffer_append(buffer, object_nl, object_nl_len);
     }
@@ -889,12 +885,6 @@ static FBuffer *cState_prepare_buffer(VALUE self)
     GET_STATE(self);
     buffer = fbuffer_alloc(state->buffer_initial_length);
 
-    if (state->object_delim) {
-        fbuffer_clear(state->object_delim);
-    } else {
-        state->object_delim = fbuffer_alloc(16);
-    }
-    fbuffer_append_char(state->object_delim, ',');
     if (state->object_delim2) {
         fbuffer_clear(state->object_delim2);
     } else {
@@ -1016,7 +1006,6 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
     objState->space_before = fstrndup(origState->space_before, origState->space_before_len);
     objState->object_nl = fstrndup(origState->object_nl, origState->object_nl_len);
     objState->array_nl = fstrndup(origState->array_nl, origState->array_nl_len);
-    if (origState->object_delim) objState->object_delim = fbuffer_dup(origState->object_delim);
     if (origState->object_delim2) objState->object_delim2 = fbuffer_dup(origState->object_delim2);
     return obj;
 }
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index b1a19df73072ae..213e94a9c639a7 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -55,7 +55,6 @@ typedef struct JSON_Generator_StateStruct {
     long object_nl_len;
     char *array_nl;
     long array_nl_len;
-    FBuffer *object_delim;
     FBuffer *object_delim2;
     long max_nesting;
     char allow_nan;

From 64c24f6971ba0341a189eefb64368cf009fbb79d Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 15:57:02 +0900
Subject: [PATCH 095/140] [ruby/json] Stop prebuilding object_delim2

Also, remove static functions that are no longer used.

This speeds up `JSON.generate` by about 5% in a benchmark.

https://github.com/ruby/json/commit/4c984b2017
---
 ext/json/fbuffer/fbuffer.h     | 15 ++++-----------
 ext/json/generator/generator.c | 18 +++---------------
 ext/json/generator/generator.h |  1 -
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
index 1fb9d667003452..aed96d4e20e58a 100644
--- a/ext/json/fbuffer/fbuffer.h
+++ b/ext/json/fbuffer/fbuffer.h
@@ -55,14 +55,15 @@ typedef struct FBufferStruct {
 
 static FBuffer *fbuffer_alloc(unsigned long initial_length);
 static void fbuffer_free(FBuffer *fb);
+#ifndef JSON_GENERATOR
 static void fbuffer_clear(FBuffer *fb);
+#endif
 static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len);
 #ifdef JSON_GENERATOR
 static void fbuffer_append_long(FBuffer *fb, long number);
 #endif
 static void fbuffer_append_char(FBuffer *fb, char newchr);
 #ifdef JSON_GENERATOR
-static FBuffer *fbuffer_dup(FBuffer *fb);
 static VALUE fbuffer_to_s(FBuffer *fb);
 #endif
 
@@ -86,10 +87,12 @@ static void fbuffer_free(FBuffer *fb)
     ruby_xfree(fb);
 }
 
+#ifndef JSON_GENERATOR
 static void fbuffer_clear(FBuffer *fb)
 {
     fb->len = 0;
 }
+#endif
 
 static inline void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
 {
@@ -168,16 +171,6 @@ static void fbuffer_append_long(FBuffer *fb, long number)
     fbuffer_append(fb, buf, len);
 }
 
-static FBuffer *fbuffer_dup(FBuffer *fb)
-{
-    unsigned long len = fb->len;
-    FBuffer *result;
-
-    result = fbuffer_alloc(len);
-    fbuffer_append(result, FBUFFER_PAIR(fb));
-    return result;
-}
-
 static VALUE fbuffer_to_s(FBuffer *fb)
 {
     VALUE result = rb_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 3432317ad8905c..cd0ae4055aef15 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -421,7 +421,6 @@ static void State_free(void *ptr)
     if (state->space_before) ruby_xfree(state->space_before);
     if (state->object_nl) ruby_xfree(state->object_nl);
     if (state->array_nl) ruby_xfree(state->array_nl);
-    if (state->object_delim2) fbuffer_free(state->object_delim2);
     ruby_xfree(state);
 }
 
@@ -434,7 +433,6 @@ static size_t State_memsize(const void *ptr)
     if (state->space_before) size += state->space_before_len + 1;
     if (state->object_nl) size += state->object_nl_len + 1;
     if (state->array_nl) size += state->array_nl_len + 1;
-    if (state->object_delim2) size += FBUFFER_CAPA(state->object_delim2);
     return size;
 }
 
@@ -648,8 +646,6 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
     long object_nl_len = state->object_nl_len;
     char *indent = state->indent;
     long indent_len = state->indent_len;
-    char *delim2 = FBUFFER_PTR(state->object_delim2);
-    long delim2_len = FBUFFER_LEN(state->object_delim2);
     long depth = state->depth;
     int j;
 
@@ -677,7 +673,9 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
     }
 
     generate_json_string(buffer, Vstate, state, key_to_s);
-    fbuffer_append(buffer, delim2, delim2_len);
+    if (RB_UNLIKELY(state->space_before)) fbuffer_append(buffer, state->space_before, state->space_before_len);
+    fbuffer_append_char(buffer, ':');
+    if (RB_UNLIKELY(state->space)) fbuffer_append(buffer, state->space, state->space_len);
     generate_json(buffer, Vstate, state, val);
 
     arg->iter++;
@@ -885,15 +883,6 @@ static FBuffer *cState_prepare_buffer(VALUE self)
     GET_STATE(self);
     buffer = fbuffer_alloc(state->buffer_initial_length);
 
-    if (state->object_delim2) {
-        fbuffer_clear(state->object_delim2);
-    } else {
-        state->object_delim2 = fbuffer_alloc(16);
-    }
-    if (state->space_before) fbuffer_append(state->object_delim2, state->space_before, state->space_before_len);
-    fbuffer_append_char(state->object_delim2, ':');
-    if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len);
-
     return buffer;
 }
 
@@ -1006,7 +995,6 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
     objState->space_before = fstrndup(origState->space_before, origState->space_before_len);
     objState->object_nl = fstrndup(origState->object_nl, origState->object_nl_len);
     objState->array_nl = fstrndup(origState->array_nl, origState->array_nl_len);
-    if (origState->object_delim2) objState->object_delim2 = fbuffer_dup(origState->object_delim2);
     return obj;
 }
 
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 213e94a9c639a7..535f2c9f982240 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -55,7 +55,6 @@ typedef struct JSON_Generator_StateStruct {
     long object_nl_len;
     char *array_nl;
     long array_nl_len;
-    FBuffer *object_delim2;
     long max_nesting;
     char allow_nan;
     char ascii_only;

From 0b4257efa3bd01fceefa51f2eef14d2c38e8fab8 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 16:06:17 +0900
Subject: [PATCH 096/140] [ruby/json] Apply RB_UNLIKELY for less frequently
 used options

This speeds up `JSON.generate` by about 4% in a benchmark.

https://github.com/ruby/json/commit/6471710cfc
---
 ext/json/generator/generator.c | 42 ++++++++++++----------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index cd0ae4055aef15..487fc68f4d2e2c 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -642,20 +642,16 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
     JSON_Generator_State *state = arg->state;
     VALUE Vstate = arg->Vstate;
 
-    char *object_nl = state->object_nl;
-    long object_nl_len = state->object_nl_len;
-    char *indent = state->indent;
-    long indent_len = state->indent_len;
     long depth = state->depth;
     int j;
 
     if (arg->iter > 0) fbuffer_append_char(buffer, ',');
-    if (object_nl) {
-        fbuffer_append(buffer, object_nl, object_nl_len);
+    if (RB_UNLIKELY(state->object_nl)) {
+        fbuffer_append(buffer, state->object_nl, state->object_nl_len);
     }
-    if (indent) {
+    if (RB_UNLIKELY(state->indent)) {
         for (j = 0; j < depth; j++) {
-            fbuffer_append(buffer, indent, indent_len);
+            fbuffer_append(buffer, state->indent, state->indent_len);
         }
     }
 
@@ -684,10 +680,6 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
 
 static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
-    char *object_nl = state->object_nl;
-    long object_nl_len = state->object_nl_len;
-    char *indent = state->indent;
-    long indent_len = state->indent_len;
     long max_nesting = state->max_nesting;
     long depth = ++state->depth;
     int j;
@@ -705,11 +697,11 @@ static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
     rb_hash_foreach(obj, json_object_i, (VALUE)&arg);
 
     depth = --state->depth;
-    if (object_nl) {
-        fbuffer_append(buffer, object_nl, object_nl_len);
-        if (indent) {
+    if (RB_UNLIKELY(state->object_nl)) {
+        fbuffer_append(buffer, state->object_nl, state->object_nl_len);
+        if (RB_UNLIKELY(state->indent)) {
             for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
+                fbuffer_append(buffer, state->indent, state->indent_len);
             }
         }
     }
@@ -718,10 +710,6 @@ static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
 
 static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
-    char *array_nl = state->array_nl;
-    long array_nl_len = state->array_nl_len;
-    char *indent = state->indent;
-    long indent_len = state->indent_len;
     long max_nesting = state->max_nesting;
     long depth = ++state->depth;
     int i, j;
@@ -729,25 +717,25 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
         rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
     }
     fbuffer_append_char(buffer, '[');
-    if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len);
+    if (RB_UNLIKELY(state->array_nl)) fbuffer_append(buffer, state->array_nl, state->array_nl_len);
     for(i = 0; i < RARRAY_LEN(obj); i++) {
         if (i > 0) {
             fbuffer_append_char(buffer, ',');
             if (RB_UNLIKELY(state->array_nl)) fbuffer_append(buffer, state->array_nl, state->array_nl_len);
         }
-        if (indent) {
+        if (RB_UNLIKELY(state->indent)) {
             for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
+                fbuffer_append(buffer, state->indent, state->indent_len);
             }
         }
         generate_json(buffer, Vstate, state, RARRAY_AREF(obj, i));
     }
     state->depth = --depth;
-    if (array_nl) {
-        fbuffer_append(buffer, array_nl, array_nl_len);
-        if (indent) {
+    if (RB_UNLIKELY(state->array_nl)) {
+        fbuffer_append(buffer, state->array_nl, state->array_nl_len);
+        if (RB_UNLIKELY(state->indent)) {
             for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
+                fbuffer_append(buffer, state->indent, state->indent_len);
             }
         }
     }

From 233f63c7fb491bddfbd5b201ba5ef1bb212afdb0 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@ruby-lang.org>
Date: Wed, 27 Dec 2023 16:32:47 +0900
Subject: [PATCH 097/140] [ruby/json] Use `RB_ENCODING_GET` instead of
 `rb_enc_get` to improve performance

This speeds up `JSON.generate` by about 12% in a benchmark.

https://github.com/ruby/json/commit/4329e30826
---
 ext/json/generator/generator.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 487fc68f4d2e2c..7d40ba4dc16246 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -742,17 +742,19 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     fbuffer_append_char(buffer, ']');
 }
 
-static int enc_utf8_compatible_p(rb_encoding *enc)
+static int usascii_encindex, utf8_encindex;
+
+static int enc_utf8_compatible_p(int enc_idx)
 {
-    if (enc == rb_usascii_encoding()) return 1;
-    if (enc == rb_utf8_encoding()) return 1;
+    if (enc_idx == usascii_encindex) return 1;
+    if (enc_idx == utf8_encindex) return 1;
     return 0;
 }
 
 static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
     fbuffer_append_char(buffer, '"');
-    if (!enc_utf8_compatible_p(rb_enc_get(obj))) {
+    if (!enc_utf8_compatible_p(RB_ENCODING_GET(obj))) {
         obj = rb_str_export_to_enc(obj, rb_utf8_encoding());
     }
     convert_UTF8_to_JSON(buffer, obj, state->ascii_only, state->script_safe);
@@ -1479,4 +1481,7 @@ void Init_generator(void)
     i_match = rb_intern("match");
     i_keys = rb_intern("keys");
     i_dup = rb_intern("dup");
+
+    usascii_encindex = rb_usascii_encindex();
+    utf8_encindex = rb_utf8_encindex();
 }

From 494d8146376028450cbd04efc42cb792753fede9 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 11:13:14 +0200
Subject: [PATCH 098/140] Optimize JSON.dump argument parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`JSON.dump` looks terrible on micro-benchmarks because the way it
handles arguments is quite allocation heavy compared to the actual
JSON generation work.

Profiling the `small hash` benchmarked show 14% of time spent in `Array#compact`
and `34%` time spent in `JSON::Ext::GeneratorState.new`. Only `41%` in the
actual `generate` function.

By micro-optimizing `JSON.dump`, it can look much better:

Before:

```
== Encoding small nested array (121 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json    91.687k i/100ms
                  oj   205.309k i/100ms
           rapidjson   161.648k i/100ms
Calculating -------------------------------------
                json    941.965k (± 1.4%) i/s    (1.06 μs/i) -      4.768M in   5.062573s
                  oj      2.138M (± 1.2%) i/s  (467.82 ns/i) -     10.881M in   5.091254s
           rapidjson      1.678M (± 1.9%) i/s  (596.04 ns/i) -      8.406M in   5.011931s

Comparison:
                json:   941964.8 i/s
                  oj:  2137586.5 i/s - 2.27x  faster
           rapidjson:  1677737.1 i/s - 1.78x  faster

== Encoding small hash (65 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   141.737k i/100ms
                  oj   676.871k i/100ms
           rapidjson   373.266k i/100ms
Calculating -------------------------------------
                json      1.491M (± 1.0%) i/s  (670.78 ns/i) -      7.512M in   5.039463s
                  oj      7.226M (± 1.4%) i/s  (138.39 ns/i) -     36.551M in   5.059475s
           rapidjson      3.729M (± 2.2%) i/s  (268.15 ns/i) -     18.663M in   5.007182s

Comparison:
                json:  1490798.2 i/s
                  oj:  7225766.2 i/s - 4.85x  faster
           rapidjson:  3729192.2 i/s - 2.50x  faster
```

After:

```
== Encoding small nested array (121 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   156.832k i/100ms
                  oj   209.769k i/100ms
           rapidjson   162.922k i/100ms
Calculating -------------------------------------
                json      1.599M (± 2.5%) i/s  (625.34 ns/i) -      7.998M in   5.005110s
                  oj      2.137M (± 1.5%) i/s  (467.99 ns/i) -     10.698M in   5.007806s
           rapidjson      1.677M (± 3.5%) i/s  (596.31 ns/i) -      8.472M in   5.059515s

Comparison:
                json:  1599141.2 i/s
                  oj:  2136785.3 i/s - 1.34x  faster
           rapidjson:  1676977.2 i/s - same-ish: difference falls within error

== Encoding small hash (65 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   216.464k i/100ms
                  oj   661.328k i/100ms
           rapidjson   324.434k i/100ms
Calculating -------------------------------------
                json      2.301M (± 1.7%) i/s  (434.57 ns/i) -     11.689M in   5.081278s
                  oj      7.244M (± 1.2%) i/s  (138.05 ns/i) -     36.373M in   5.021985s
           rapidjson      3.323M (± 2.9%) i/s  (300.96 ns/i) -     16.871M in   5.081696s

Comparison:
                json:  2301142.2 i/s
                  oj:  7243770.3 i/s - 3.15x  faster
           rapidjson:  3322673.0 i/s - 1.44x  faster
```

Now profiles of the `small hash` benchmark show 44% in `generate` and
`45%` in `GeneratorState` allocation.
---
 ext/json/lib/json/common.rb | 42 +++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 95098d3bb48f79..95acd2ac4d9c4f 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -613,26 +613,42 @@ class << self
   # Output:
   #   {"foo":[0,1],"bar":{"baz":2,"bat":3},"bam":"bad"}
   def dump(obj, anIO = nil, limit = nil, kwargs = nil)
-    io_limit_opt = [anIO, limit, kwargs].compact
-    kwargs = io_limit_opt.pop if io_limit_opt.last.is_a?(Hash)
-    anIO, limit = io_limit_opt
-    if anIO.respond_to?(:to_io)
-      anIO = anIO.to_io
-    elsif limit.nil? && !anIO.respond_to?(:write)
-      anIO, limit = nil, anIO
+    if kwargs.nil?
+      if limit.nil?
+        if anIO.is_a?(Hash)
+          kwargs = anIO
+          anIO = nil
+        end
+      elsif limit.is_a?(Hash)
+        kwargs = limit
+        limit = nil
+      end
     end
+
+    unless anIO.nil?
+      if anIO.respond_to?(:to_io)
+        anIO = anIO.to_io
+      elsif limit.nil? && !anIO.respond_to?(:write)
+        anIO, limit = nil, anIO
+      end
+    end
+
     opts = JSON.dump_default_options
     opts = opts.merge(:max_nesting => limit) if limit
     opts = merge_dump_options(opts, **kwargs) if kwargs
-    result = generate(obj, opts)
-    if anIO
+
+    result = begin
+      generate(obj, opts)
+    rescue JSON::NestingError
+      raise ArgumentError, "exceed depth limit"
+    end
+
+    if anIO.nil?
+      result
+    else
       anIO.write result
       anIO
-    else
-      result
     end
-  rescue JSON::NestingError
-    raise ArgumentError, "exceed depth limit"
   end
 
   # Encodes string using String.encode.

From 1f0b54033242f35177800d9f82bebb16aa106aed Mon Sep 17 00:00:00 2001
From: Mads Ohm Larsen <mads.ohm@gmail.com>
Date: Thu, 17 Oct 2024 12:10:31 +0200
Subject: [PATCH 099/140] [ruby/rdoc] Add scroll-margin-top on all :target
 elements (https://github.com/ruby/rdoc/pull/1174)

https://github.com/ruby/rdoc/commit/7398e5b0ad

Co-authored-by: Stan Lo <stan001212@gmail.com>
---
 lib/rdoc/generator/template/darkfish/css/rdoc.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css
index 12212a341e3a01..d525b0ef7dfe93 100644
--- a/lib/rdoc/generator/template/darkfish/css/rdoc.css
+++ b/lib/rdoc/generator/template/darkfish/css/rdoc.css
@@ -85,6 +85,7 @@ h5:target,
 h6:target {
   margin-left: -10px;
   border-left: 10px solid var(--source-code-background-color);
+  scroll-margin-top: 1rem;
 }
 
 /* 4. Links */

From fc11579c49f3a924699a0af0fd9f5b1a02617f7e Mon Sep 17 00:00:00 2001
From: Stan Lo <stan001212@gmail.com>
Date: Thu, 17 Oct 2024 18:10:59 +0800
Subject: [PATCH 100/140] [ruby/rdoc] Use scroll-margin-top on anchor targets
 (https://github.com/ruby/rdoc/pull/1190)

This will make the anchor target easier to read.

https://github.com/ruby/rdoc/commit/e2fe4882f4
---
 lib/rdoc/generator/template/darkfish/class.rhtml  | 10 +++++-----
 lib/rdoc/generator/template/darkfish/css/rdoc.css |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
index afac0c44cd4b4c..85fb0c1c33b693 100644
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ b/lib/rdoc/generator/template/darkfish/class.rhtml
@@ -18,7 +18,7 @@
 </nav>
 
 <main role="main" aria-labelledby="<%=h klass.aref %>">
-  <h1 id="<%=h klass.aref %>" class="<%= klass.type %>">
+  <h1 id="<%=h klass.aref %>" class="anchor-link <%= klass.type %>">
     <%= klass.type %> <%= klass.full_name %>
   </h1>
 
@@ -27,7 +27,7 @@
   </section>
 
   <%- klass.each_section do |section, constants, attributes| -%>
-  <section id="<%= section.aref %>" class="documentation-section">
+  <section id="<%= section.aref %>" class="documentation-section anchor-link">
     <%- if section.title then -%>
     <header class="documentation-section-title">
       <h2>
@@ -70,7 +70,7 @@
       </header>
 
       <%- attributes.each do |attrib| -%>
-      <div id="<%= attrib.aref %>" class="method-detail">
+      <div id="<%= attrib.aref %>" class="method-detail anchor-link">
         <div class="method-heading attribute-method-heading">
           <a href="#<%= attrib.aref %>" title="Link to this attribute">
             <span class="method-name"><%= h attrib.name %></span>
@@ -94,13 +94,13 @@
        next if visibilities.empty?
        visibilities.each do |visibility, methods|
          next if methods.empty? %>
-     <section id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details" class="method-section">
+     <section id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details" class="method-section anchor-link">
        <header>
          <h3><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</h3>
        </header>
 
     <%- methods.each do |method| -%>
-      <div id="<%= method.aref %>" class="method-detail <%= method.is_alias_for ? "method-alias" : '' %>">
+      <div id="<%= method.aref %>" class="method-detail anchor-link <%= method.is_alias_for ? "method-alias" : '' %>">
         <div class="method-header">
           <%- if (call_seq = method.call_seq) then -%>
             <%- call_seq.strip.split("\n").each_with_index do |call_seq, i| -%>
diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css
index d525b0ef7dfe93..49138c6292e48b 100644
--- a/lib/rdoc/generator/template/darkfish/css/rdoc.css
+++ b/lib/rdoc/generator/template/darkfish/css/rdoc.css
@@ -429,6 +429,10 @@ main sup {
   font-size: 0.8em;
 }
 
+main .anchor-link:target {
+  scroll-margin-top: 20px;
+}
+
 /* The heading with the class name */
 main h1[class] {
   margin-top: 0;

From 5a1895643052a8609adaca09b52aba9b1babdc22 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 17 Oct 2024 19:34:31 +0900
Subject: [PATCH 101/140] ruby-style.el: Minimize backslash columns [ci skip]

Basically we don't align line continuation backslashes.
---
 misc/ruby-style.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/misc/ruby-style.el b/misc/ruby-style.el
index 45fdccc6f2457c..03d0830d3abe28 100644
--- a/misc/ruby-style.el
+++ b/misc/ruby-style.el
@@ -56,7 +56,9 @@
    (c-basic-offset . 4)
    (tab-width . 8)
    (indent-tabs-mode . nil)
-   (setq show-trailing-whitespace t)
+   (show-trailing-whitespace . t)
+   (c-backslash-column . 1)
+   (c-backslash-max-column . 1)
    (c-offsets-alist
     (case-label . *)
     (label . (ruby-style-label-indent *))
@@ -72,7 +74,7 @@
    (c-basic-offset . 4)
    (tab-width . 8)
    (indent-tabs-mode . nil)
-   (setq show-trailing-whitespace t)
+   (show-trailing-whitespace . t)
    (c-offsets-alist
     (case-label . +)
     )))

From 43e08133c35351f0efd7bdfacf490b0ef38ecc22 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 11:56:07 +0200
Subject: [PATCH 102/140] [ruby/json] Convert Generator initialize and
 configure method into Ruby

This helps very marginally with allocation speed.

https://github.com/ruby/json/commit/25db79dfaa
---
 ext/json/generator/generator.c  | 266 ++++----------------------------
 ext/json/generator/generator.h  |   3 -
 ext/json/lib/json/ext.rb        |   5 +
 lib/json/ext/generator/state.rb | 125 +++++++++++++++
 4 files changed, 160 insertions(+), 239 deletions(-)
 create mode 100644 lib/json/ext/generator/state.rb

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 7d40ba4dc16246..9d17ffbb206250 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -16,11 +16,7 @@ static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
              mTrueClass, mFalseClass, mNilClass, eGeneratorError,
              eNestingError;
 
-static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
-          i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only,
-          i_pack, i_unpack, i_create_id, i_extend, i_key_p,
-          i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth,
-          i_buffer_initial_length, i_dup, i_script_safe, i_escape_slash, i_strict;
+static ID i_to_s, i_to_json, i_new, i_pack, i_unpack, i_create_id, i_extend;
 
 /* Converts in_string to a JSON string (without the wrapping '"'
  * characters) in FBuffer out_buffer.
@@ -451,180 +447,10 @@ static const rb_data_type_t JSON_Generator_State_type = {
 static VALUE cState_s_allocate(VALUE klass)
 {
     JSON_Generator_State *state;
-    return TypedData_Make_Struct(klass, JSON_Generator_State,
-				 &JSON_Generator_State_type, state);
-}
-
-/*
- * call-seq: configure(opts)
- *
- * Configure this State instance with the Hash _opts_, and return
- * itself.
- */
-static VALUE cState_configure(VALUE self, VALUE opts)
-{
-    VALUE tmp;
-    GET_STATE(self);
-    tmp = rb_check_convert_type(opts, T_HASH, "Hash", "to_hash");
-    if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
-    opts = tmp;
-    tmp = rb_hash_aref(opts, ID2SYM(i_indent));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->indent = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->indent_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_space));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->space = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->space_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->space_before = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->space_before_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->array_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->array_nl_len = len;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
-    if (RTEST(tmp)) {
-        unsigned long len;
-        Check_Type(tmp, T_STRING);
-        len = RSTRING_LEN(tmp);
-        state->object_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
-        state->object_nl_len = len;
-    }
-    tmp = ID2SYM(i_max_nesting);
+    VALUE obj = TypedData_Make_Struct(klass, JSON_Generator_State, &JSON_Generator_State_type, state);
     state->max_nesting = 100;
-    if (option_given_p(opts, tmp)) {
-        VALUE max_nesting = rb_hash_aref(opts, tmp);
-        if (RTEST(max_nesting)) {
-            Check_Type(max_nesting, T_FIXNUM);
-            state->max_nesting = FIX2LONG(max_nesting);
-        } else {
-            state->max_nesting = 0;
-        }
-    }
-    tmp = ID2SYM(i_depth);
-    state->depth = 0;
-    if (option_given_p(opts, tmp)) {
-        VALUE depth = rb_hash_aref(opts, tmp);
-        if (RTEST(depth)) {
-            Check_Type(depth, T_FIXNUM);
-            state->depth = FIX2LONG(depth);
-        } else {
-            state->depth = 0;
-        }
-    }
-    tmp = ID2SYM(i_buffer_initial_length);
-    if (option_given_p(opts, tmp)) {
-        VALUE buffer_initial_length = rb_hash_aref(opts, tmp);
-        if (RTEST(buffer_initial_length)) {
-            long initial_length;
-            Check_Type(buffer_initial_length, T_FIXNUM);
-            initial_length = FIX2LONG(buffer_initial_length);
-            if (initial_length > 0) state->buffer_initial_length = initial_length;
-        }
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
-    state->allow_nan = RTEST(tmp);
-    tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
-    state->ascii_only = RTEST(tmp);
-    tmp = rb_hash_aref(opts, ID2SYM(i_script_safe));
-    state->script_safe = RTEST(tmp);
-    if (!state->script_safe) {
-        tmp = rb_hash_aref(opts, ID2SYM(i_escape_slash));
-        state->script_safe = RTEST(tmp);
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_strict));
-    state->strict = RTEST(tmp);
-    return self;
-}
-
-static void set_state_ivars(VALUE hash, VALUE state)
-{
-    VALUE ivars = rb_obj_instance_variables(state);
-    int i = 0;
-    for (i = 0; i < RARRAY_LEN(ivars); i++) {
-        VALUE key = rb_funcall(rb_ary_entry(ivars, i), i_to_s, 0);
-        long key_len = RSTRING_LEN(key);
-        VALUE value = rb_iv_get(state, StringValueCStr(key));
-        rb_hash_aset(hash, rb_str_intern(rb_str_substr(key, 1, key_len - 1)), value);
-    }
-}
-
-/*
- * call-seq: to_h
- *
- * Returns the configuration instance variables as a hash, that can be
- * passed to the configure method.
- */
-static VALUE cState_to_h(VALUE self)
-{
-    VALUE result = rb_hash_new();
-    GET_STATE(self);
-    set_state_ivars(result, self);
-    rb_hash_aset(result, ID2SYM(i_indent), rb_str_new(state->indent, state->indent_len));
-    rb_hash_aset(result, ID2SYM(i_space), rb_str_new(state->space, state->space_len));
-    rb_hash_aset(result, ID2SYM(i_space_before), rb_str_new(state->space_before, state->space_before_len));
-    rb_hash_aset(result, ID2SYM(i_object_nl), rb_str_new(state->object_nl, state->object_nl_len));
-    rb_hash_aset(result, ID2SYM(i_array_nl), rb_str_new(state->array_nl, state->array_nl_len));
-    rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_ascii_only), state->ascii_only ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
-    rb_hash_aset(result, ID2SYM(i_script_safe), state->script_safe ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_strict), state->strict ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth));
-    rb_hash_aset(result, ID2SYM(i_buffer_initial_length), LONG2FIX(state->buffer_initial_length));
-    return result;
-}
-
-/*
-* call-seq: [](name)
-*
-* Returns the value returned by method +name+.
-*/
-static VALUE cState_aref(VALUE self, VALUE name)
-{
-    name = rb_funcall(name, i_to_s, 0);
-    if (RTEST(rb_funcall(self, i_respond_to_p, 1, name))) {
-        return rb_funcall(self, i_send, 1, name);
-    } else {
-        return rb_attr_get(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)));
-    }
-}
-
-/*
-* call-seq: []=(name, value)
-*
-* Sets the attribute name to value.
-*/
-static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
-{
-    VALUE name_writer;
-
-    name = rb_funcall(name, i_to_s, 0);
-    name_writer = rb_str_cat2(rb_str_dup(name), "=");
-    if (RTEST(rb_funcall(self, i_respond_to_p, 1, name_writer))) {
-        return rb_funcall(self, i_send, 2, name_writer, value);
-    } else {
-        rb_ivar_set(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)), value);
-    }
-    return Qnil;
+    state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
+    return obj;
 }
 
 struct hash_foreach_arg {
@@ -933,37 +759,6 @@ static VALUE cState_generate(VALUE self, VALUE obj)
     return result;
 }
 
-/*
- * call-seq: new(opts = {})
- *
- * Instantiates a new State object, configured by _opts_.
- *
- * _opts_ can have the following keys:
- *
- * * *indent*: a string used to indent levels (default: ''),
- * * *space*: a string that is put after, a : or , delimiter (default: ''),
- * * *space_before*: a string that is put before a : pair delimiter (default: ''),
- * * *object_nl*: a string that is put at the end of a JSON object (default: ''),
- * * *array_nl*: a string that is put at the end of a JSON array (default: ''),
- * * *allow_nan*: true if NaN, Infinity, and -Infinity should be
- *   generated, otherwise an exception is thrown, if these values are
- *   encountered. This options defaults to false.
- * * *ascii_only*: true if only ASCII characters should be generated. This
- *   option defaults to false.
- * * *buffer_initial_length*: sets the initial length of the generator's
- *   internal buffer.
- */
-static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE opts;
-    GET_STATE(self);
-    state->max_nesting = 100;
-    state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
-    rb_scan_args(argc, argv, "01", &opts);
-    if (!NIL_P(opts)) cState_configure(self, opts);
-    return self;
-}
-
 /*
  * call-seq: initialize_copy(orig)
  *
@@ -1294,6 +1089,18 @@ static VALUE cState_allow_nan_p(VALUE self)
     return state->allow_nan ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq: allow_nan=(enable)
+ *
+ * This sets whether or not to serialize NaN, Infinity, and -Infinity
+ */
+static VALUE cState_allow_nan_set(VALUE self, VALUE enable)
+{
+    GET_STATE(self);
+    state->allow_nan = RTEST(enable);
+    return Qnil;
+}
+
 /*
  * call-seq: ascii_only?
  *
@@ -1306,6 +1113,18 @@ static VALUE cState_ascii_only_p(VALUE self)
     return state->ascii_only ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq: ascii_only=(enable)
+ *
+ * This sets whether only ASCII characters should be generated.
+ */
+static VALUE cState_ascii_only_set(VALUE self, VALUE enable)
+{
+    GET_STATE(self);
+    state->ascii_only = RTEST(enable);
+    return Qnil;
+}
+
 /*
  * call-seq: depth
  *
@@ -1384,7 +1203,6 @@ void Init_generator(void)
     cState = rb_define_class_under(mGenerator, "State", rb_cObject);
     rb_define_alloc_func(cState, cState_s_allocate);
     rb_define_singleton_method(cState, "from_state", cState_from_state_s, 1);
-    rb_define_method(cState, "initialize", cState_initialize, -1);
     rb_define_method(cState, "initialize_copy", cState_init_copy, 1);
     rb_define_method(cState, "indent", cState_indent, 0);
     rb_define_method(cState, "indent=", cState_indent_set, 1);
@@ -1409,17 +1227,13 @@ void Init_generator(void)
     rb_define_method(cState, "strict=", cState_strict_set, 1);
     rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
     rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
+    rb_define_method(cState, "allow_nan=", cState_allow_nan_set, 1);
     rb_define_method(cState, "ascii_only?", cState_ascii_only_p, 0);
+    rb_define_method(cState, "ascii_only=", cState_ascii_only_set, 1);
     rb_define_method(cState, "depth", cState_depth, 0);
     rb_define_method(cState, "depth=", cState_depth_set, 1);
     rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0);
     rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1);
-    rb_define_method(cState, "configure", cState_configure, 1);
-    rb_define_alias(cState, "merge", "configure");
-    rb_define_method(cState, "to_h", cState_to_h, 0);
-    rb_define_alias(cState, "to_hash", "to_h");
-    rb_define_method(cState, "[]", cState_aref, 1);
-    rb_define_method(cState, "[]=", cState_aset, 2);
     rb_define_method(cState, "generate", cState_generate, 1);
 
     mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
@@ -1457,30 +1271,10 @@ void Init_generator(void)
     i_to_s = rb_intern("to_s");
     i_to_json = rb_intern("to_json");
     i_new = rb_intern("new");
-    i_indent = rb_intern("indent");
-    i_space = rb_intern("space");
-    i_space_before = rb_intern("space_before");
-    i_object_nl = rb_intern("object_nl");
-    i_array_nl = rb_intern("array_nl");
-    i_max_nesting = rb_intern("max_nesting");
-    i_script_safe = rb_intern("script_safe");
-    i_escape_slash = rb_intern("escape_slash");
-    i_strict = rb_intern("strict");
-    i_allow_nan = rb_intern("allow_nan");
-    i_ascii_only = rb_intern("ascii_only");
-    i_depth = rb_intern("depth");
-    i_buffer_initial_length = rb_intern("buffer_initial_length");
     i_pack = rb_intern("pack");
     i_unpack = rb_intern("unpack");
     i_create_id = rb_intern("create_id");
     i_extend = rb_intern("extend");
-    i_key_p = rb_intern("key?");
-    i_aref = rb_intern("[]");
-    i_send = rb_intern("__send__");
-    i_respond_to_p = rb_intern("respond_to?");
-    i_match = rb_intern("match");
-    i_keys = rb_intern("keys");
-    i_dup = rb_intern("dup");
 
     usascii_encindex = rb_usascii_encindex();
     utf8_encindex = rb_utf8_encindex();
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 535f2c9f982240..25905498a3d5cd 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -103,8 +103,6 @@ static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self);
 static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self);
 static void State_free(void *state);
 static VALUE cState_s_allocate(VALUE klass);
-static VALUE cState_configure(VALUE self, VALUE opts);
-static VALUE cState_to_h(VALUE self);
 static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
 static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
 static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
@@ -120,7 +118,6 @@ static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
 static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
 static VALUE cState_partial_generate(VALUE self, VALUE obj);
 static VALUE cState_generate(VALUE self, VALUE obj);
-static VALUE cState_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE cState_from_state_s(VALUE self, VALUE opts);
 static VALUE cState_indent(VALUE self);
 static VALUE cState_indent_set(VALUE self, VALUE indent);
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
index b62e2317123faa..775e28a967a8ef 100644
--- a/ext/json/lib/json/ext.rb
+++ b/ext/json/lib/json/ext.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json/common'
 
 module JSON
@@ -13,6 +15,9 @@ module Ext
     else
       require 'json/ext/parser'
       require 'json/ext/generator'
+      unless RUBY_ENGINE == 'jruby'
+        require 'json/ext/generator/state'
+      end
       $DEBUG and warn "Using Ext extension for JSON."
       JSON.parser = Parser
       JSON.generator = Generator
diff --git a/lib/json/ext/generator/state.rb b/lib/json/ext/generator/state.rb
new file mode 100644
index 00000000000000..09e31e7c5755bd
--- /dev/null
+++ b/lib/json/ext/generator/state.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+module JSON
+  module Ext
+    module Generator
+      class State
+        # call-seq: new(opts = {})
+        #
+        # Instantiates a new State object, configured by _opts_.
+        #
+        # _opts_ can have the following keys:
+        #
+        # * *indent*: a string used to indent levels (default: ''),
+        # * *space*: a string that is put after, a : or , delimiter (default: ''),
+        # * *space_before*: a string that is put before a : pair delimiter (default: ''),
+        # * *object_nl*: a string that is put at the end of a JSON object (default: ''),
+        # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
+        # * *allow_nan*: true if NaN, Infinity, and -Infinity should be
+        #   generated, otherwise an exception is thrown, if these values are
+        #   encountered. This options defaults to false.
+        # * *ascii_only*: true if only ASCII characters should be generated. This
+        #   option defaults to false.
+        # * *buffer_initial_length*: sets the initial length of the generator's
+        #   internal buffer.
+        def initialize(opts = nil)
+          if opts && !opts.empty?
+            configure(opts)
+          end
+        end
+
+        # call-seq: configure(opts)
+        #
+        # Configure this State instance with the Hash _opts_, and return
+        # itself.
+        def configure(opts)
+          unless opts.is_a?(Hash)
+            if opts.respond_to?(:to_hash)
+              opts = opts.to_hash
+            elsif opts.respond_to?(:to_h)
+              opts = opts.to_h
+            else
+              raise TypeError, "can't convert #{opts.class} into Hash"
+            end
+          end
+
+          self.indent = opts[:indent] if opts.key?(:indent)
+          self.space = opts[:space] if opts.key?(:space)
+          self.space_before = opts[:space_before] if opts.key?(:space_before)
+          self.array_nl = opts[:array_nl] if opts.key?(:array_nl)
+          self.object_nl = opts[:object_nl] if opts.key?(:object_nl)
+          self.max_nesting = opts[:max_nesting] || 0 if opts.key?(:max_nesting)
+          self.depth = opts[:depth] if opts.key?(:depth)
+          self.buffer_initial_length = opts[:buffer_initial_length] if opts.key?(:buffer_initial_length)
+          self.allow_nan = opts[:allow_nan] if opts.key?(:allow_nan)
+          self.ascii_only = opts[:ascii_only] if opts.key?(:ascii_only)
+
+          if opts.key?(:script_safe)
+            self.script_safe = opts[:script_safe]
+          elsif opts.key?(:escape_slash)
+            self.script_safe = opts[:escape_slash]
+          end
+
+          self.strict = opts[:strict] if opts[:strict]
+
+          self
+        end
+
+        alias_method :merge, :configure
+
+        # call-seq: to_h
+        #
+        # Returns the configuration instance variables as a hash, that can be
+        # passed to the configure method.
+        def to_h
+          result = {
+            indent: indent,
+            space: space,
+            space_before: space_before,
+            object_nl: object_nl,
+            array_nl: array_nl,
+            allow_nan: allow_nan?,
+            ascii_only: ascii_only?,
+            max_nesting: max_nesting,
+            script_safe: script_safe?,
+            strict: strict?,
+            depth: depth,
+            buffer_initial_length: buffer_initial_length,
+          }
+
+          instance_variables.each do |iv|
+            iv = iv.to_s[1..-1]
+            result[iv.to_sym] = self[iv]
+          end
+
+          result
+        end
+
+        alias_method :to_hash, :to_h
+
+        # call-seq: [](name)
+        #
+        # Returns the value returned by method +name+.
+        def [](name)
+          if respond_to?(name)
+            __send__(name)
+          else
+            instance_variable_get("@#{name}") if
+              instance_variables.include?("@#{name}".to_sym) # avoid warning
+          end
+        end
+
+        # call-seq: []=(name, value)
+        #
+        # Sets the attribute name to value.
+        def []=(name, value)
+          if respond_to?(name_writer = "#{name}=")
+            __send__ name_writer, value
+          else
+            instance_variable_set "@#{name}", value
+          end
+        end
+      end
+    end
+  end
+end

From a1c420c740c66206d92b0fd0f880f226a1592b5d Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 12:21:57 +0200
Subject: [PATCH 103/140] [ruby/json] generator.c: reduce the number of globals

Most of these classes and modules don't need to be global variables

https://github.com/ruby/json/commit/b783445ec9
---
 ext/json/generator/generator.c | 49 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 9d17ffbb206250..576ab4e9c9f265 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -5,16 +5,7 @@
 #define RB_UNLIKELY(cond) (cond)
 #endif
 
-static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
-             mHash, mArray,
-#ifdef RUBY_INTEGER_UNIFICATION
-             mInteger,
-#else
-             mFixnum, mBignum,
-#endif
-             mFloat, mString, mString_Extend,
-             mTrueClass, mFalseClass, mNilClass, eGeneratorError,
-             eNestingError;
+static VALUE mJSON, cState, mString_Extend, eGeneratorError, eNestingError;
 
 static ID i_to_s, i_to_json, i_new, i_pack, i_unpack, i_create_id, i_extend;
 
@@ -1192,8 +1183,8 @@ void Init_generator(void)
     rb_require("json/common");
 
     mJSON = rb_define_module("JSON");
-    mExt = rb_define_module_under(mJSON, "Ext");
-    mGenerator = rb_define_module_under(mExt, "Generator");
+    VALUE mExt = rb_define_module_under(mJSON, "Ext");
+    VALUE mGenerator = rb_define_module_under(mExt, "Generator");
 
     eGeneratorError = rb_path2class("JSON::GeneratorError");
     eNestingError = rb_path2class("JSON::NestingError");
@@ -1236,36 +1227,46 @@ void Init_generator(void)
     rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1);
     rb_define_method(cState, "generate", cState_generate, 1);
 
-    mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
-    mObject = rb_define_module_under(mGeneratorMethods, "Object");
+    VALUE mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
+
+    VALUE mObject = rb_define_module_under(mGeneratorMethods, "Object");
     rb_define_method(mObject, "to_json", mObject_to_json, -1);
-    mHash = rb_define_module_under(mGeneratorMethods, "Hash");
+
+    VALUE mHash = rb_define_module_under(mGeneratorMethods, "Hash");
     rb_define_method(mHash, "to_json", mHash_to_json, -1);
-    mArray = rb_define_module_under(mGeneratorMethods, "Array");
+
+    VALUE mArray = rb_define_module_under(mGeneratorMethods, "Array");
     rb_define_method(mArray, "to_json", mArray_to_json, -1);
+
 #ifdef RUBY_INTEGER_UNIFICATION
-    mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
+    VALUE mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
     rb_define_method(mInteger, "to_json", mInteger_to_json, -1);
 #else
-    mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
+    VALUE mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
     rb_define_method(mFixnum, "to_json", mFixnum_to_json, -1);
-    mBignum = rb_define_module_under(mGeneratorMethods, "Bignum");
+
+    VALUE mBignum = rb_define_module_under(mGeneratorMethods, "Bignum");
     rb_define_method(mBignum, "to_json", mBignum_to_json, -1);
 #endif
-    mFloat = rb_define_module_under(mGeneratorMethods, "Float");
+    VALUE mFloat = rb_define_module_under(mGeneratorMethods, "Float");
     rb_define_method(mFloat, "to_json", mFloat_to_json, -1);
-    mString = rb_define_module_under(mGeneratorMethods, "String");
+
+    VALUE mString = rb_define_module_under(mGeneratorMethods, "String");
     rb_define_singleton_method(mString, "included", mString_included_s, 1);
     rb_define_method(mString, "to_json", mString_to_json, -1);
     rb_define_method(mString, "to_json_raw", mString_to_json_raw, -1);
     rb_define_method(mString, "to_json_raw_object", mString_to_json_raw_object, 0);
+
     mString_Extend = rb_define_module_under(mString, "Extend");
     rb_define_method(mString_Extend, "json_create", mString_Extend_json_create, 1);
-    mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
+
+    VALUE mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
     rb_define_method(mTrueClass, "to_json", mTrueClass_to_json, -1);
-    mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
+
+    VALUE mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
     rb_define_method(mFalseClass, "to_json", mFalseClass_to_json, -1);
-    mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
+
+    VALUE mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
     rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
 
     i_to_s = rb_intern("to_s");

From 0e2ac4658430ae5c8beba36e0b608902b3404879 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 12:36:13 +0200
Subject: [PATCH 104/140] Optimize Ext::Generator::State#configure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we assume that most of the time the `opts` hash is small
it's faster to go over the provided keys with a `case` than
to test all possible keys one by one.

Before:

```
== Encoding small nested array (121 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   156.832k i/100ms
                  oj   209.769k i/100ms
           rapidjson   162.922k i/100ms
Calculating -------------------------------------
                json      1.599M (± 2.5%) i/s  (625.34 ns/i) -      7.998M in   5.005110s
                  oj      2.137M (± 1.5%) i/s  (467.99 ns/i) -     10.698M in   5.007806s
           rapidjson      1.677M (± 3.5%) i/s  (596.31 ns/i) -      8.472M in   5.059515s

Comparison:
                json:  1599141.2 i/s
                  oj:  2136785.3 i/s - 1.34x  faster
           rapidjson:  1676977.2 i/s - same-ish: difference falls within error

== Encoding small hash (65 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   216.464k i/100ms
                  oj   661.328k i/100ms
           rapidjson   324.434k i/100ms
Calculating -------------------------------------
                json      2.301M (± 1.7%) i/s  (434.57 ns/i) -     11.689M in   5.081278s
                  oj      7.244M (± 1.2%) i/s  (138.05 ns/i) -     36.373M in   5.021985s
           rapidjson      3.323M (± 2.9%) i/s  (300.96 ns/i) -     16.871M in   5.081696s

Comparison:
                json:  2301142.2 i/s
                  oj:  7243770.3 i/s - 3.15x  faster
           rapidjson:  3322673.0 i/s - 1.44x  faster
```

After:

```
== Encoding small nested array (121 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   168.087k i/100ms
                  oj   208.872k i/100ms
           rapidjson   149.909k i/100ms
Calculating -------------------------------------
                json      1.761M (± 1.1%) i/s  (567.90 ns/i) -      8.909M in   5.059794s
                  oj      2.144M (± 0.9%) i/s  (466.37 ns/i) -     10.861M in   5.065903s
           rapidjson      1.692M (± 1.7%) i/s  (591.04 ns/i) -      8.545M in   5.051808s

Comparison:
                json:  1760868.2 i/s
                  oj:  2144205.9 i/s - 1.22x  faster
           rapidjson:  1691941.1 i/s - 1.04x  slower

== Encoding small hash (65 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   242.957k i/100ms
                  oj   675.217k i/100ms
           rapidjson   355.040k i/100ms
Calculating -------------------------------------
                json      2.569M (± 1.5%) i/s  (389.22 ns/i) -     12.877M in   5.013095s
                  oj      7.128M (± 2.3%) i/s  (140.30 ns/i) -     35.787M in   5.023594s
           rapidjson      3.656M (± 3.1%) i/s  (273.50 ns/i) -     18.462M in   5.054558s

Comparison:
                json:  2569217.5 i/s
                  oj:  7127705.6 i/s - 2.77x  faster
           rapidjson:  3656285.0 i/s - 1.42x  faster
```
---
 ext/json/lib/json/common.rb     |  3 +--
 lib/json/ext/generator/state.rb | 44 ++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 95acd2ac4d9c4f..840c630fd5ed6e 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -576,13 +576,12 @@ class << self
     # Sets or returns the default options for the JSON.dump method.
     # Initially:
     #   opts = JSON.dump_default_options
-    #   opts # => {:max_nesting=>false, :allow_nan=>true, :script_safe=>false}
+    #   opts # => {:max_nesting=>false, :allow_nan=>true}
     attr_accessor :dump_default_options
   end
   self.dump_default_options = {
     :max_nesting => false,
     :allow_nan   => true,
-    :script_safe => false,
   }
 
   # :call-seq:
diff --git a/lib/json/ext/generator/state.rb b/lib/json/ext/generator/state.rb
index 09e31e7c5755bd..4f9675d7b5ba16 100644
--- a/lib/json/ext/generator/state.rb
+++ b/lib/json/ext/generator/state.rb
@@ -43,25 +43,35 @@ def configure(opts)
             end
           end
 
-          self.indent = opts[:indent] if opts.key?(:indent)
-          self.space = opts[:space] if opts.key?(:space)
-          self.space_before = opts[:space_before] if opts.key?(:space_before)
-          self.array_nl = opts[:array_nl] if opts.key?(:array_nl)
-          self.object_nl = opts[:object_nl] if opts.key?(:object_nl)
-          self.max_nesting = opts[:max_nesting] || 0 if opts.key?(:max_nesting)
-          self.depth = opts[:depth] if opts.key?(:depth)
-          self.buffer_initial_length = opts[:buffer_initial_length] if opts.key?(:buffer_initial_length)
-          self.allow_nan = opts[:allow_nan] if opts.key?(:allow_nan)
-          self.ascii_only = opts[:ascii_only] if opts.key?(:ascii_only)
-
-          if opts.key?(:script_safe)
-            self.script_safe = opts[:script_safe]
-          elsif opts.key?(:escape_slash)
-            self.script_safe = opts[:escape_slash]
+          opts.each do |key, value|
+            case key
+            when :indent
+              self.indent = value
+            when :space
+              self.space = value
+            when :space_before
+              self.space_before = value
+            when :array_nl
+              self.array_nl = value
+            when :object_nl
+              self.object_nl = value
+            when :max_nesting
+              self.max_nesting = value || 0
+            when :depth
+              self.depth = value
+            when :buffer_initial_length
+              self.buffer_initial_length = value
+            when :allow_nan
+              self.allow_nan = value
+            when :ascii_only
+              self.ascii_only = value
+            when :script_safe, :escape_slash
+              self.script_safe = value
+            when :strict
+              self.strict = value
+            end
           end
 
-          self.strict = opts[:strict] if opts[:strict]
-
           self
         end
 

From 6105bae331aa8a804ffa762735e8647507f85179 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 14:17:31 +0200
Subject: [PATCH 105/140] [ruby/json] Get rid of compatibility code for older
 rubies

All of these are for rubies older than 2.3.

https://github.com/ruby/json/commit/811297f86a
---
 ext/json/generator/generator.h | 25 -------------------------
 ext/json/parser/parser.h       | 19 -------------------
 2 files changed, 44 deletions(-)

diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 25905498a3d5cd..09bf68079c9c25 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -23,22 +23,6 @@ typedef unsigned char _Bool;
 #endif
 #endif
 
-#ifdef HAVE_RUBY_RE_H
-#include "ruby/re.h"
-#else
-#include "re.h"
-#endif
-
-#ifndef rb_intern_str
-#define rb_intern_str(string) SYM2ID(rb_str_intern(string))
-#endif
-
-#ifndef rb_obj_instance_variables
-#define rb_obj_instance_variables(object) rb_funcall(object, rb_intern("instance_variables"), 0)
-#endif
-
-#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
-
 static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_ascii_only, bool out_script_safe);
 static char *fstrndup(const char *ptr, unsigned long len);
 
@@ -140,15 +124,6 @@ static VALUE cState_script_safe_set(VALUE self, VALUE depth);
 static VALUE cState_strict(VALUE self);
 static VALUE cState_strict_set(VALUE self, VALUE strict);
 static FBuffer *cState_prepare_buffer(VALUE self);
-#ifndef ZALLOC
-#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
-static inline void *ruby_zalloc(size_t n)
-{
-    void *p = ruby_xmalloc(n);
-    memset(p, 0, n);
-    return p;
-}
-#endif
 
 static const rb_data_type_t JSON_Generator_State_type;
 
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index f6974461ae478c..e11bddf7c2c050 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -3,16 +3,6 @@
 
 #include "ruby.h"
 
-#ifndef HAVE_RUBY_RE_H
-#include "re.h"
-#endif
-
-#ifdef HAVE_RUBY_ST_H
-#include "ruby/st.h"
-#else
-#include "st.h"
-#endif
-
 #ifndef MAYBE_UNUSED
 # define MAYBE_UNUSED(x) x
 #endif
@@ -64,15 +54,6 @@ static void JSON_mark(void *json);
 static void JSON_free(void *json);
 static VALUE cJSON_parser_s_allocate(VALUE klass);
 static VALUE cParser_source(VALUE self);
-#ifndef ZALLOC
-#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
-static inline void *ruby_zalloc(size_t n)
-{
-    void *p = ruby_xmalloc(n);
-    memset(p, 0, n);
-    return p;
-}
-#endif
 
 static const rb_data_type_t JSON_Parser_type;
 

From df48f597cfe7be7e2aa27a886f67a021e2d6cd5f Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 14:55:18 +0200
Subject: [PATCH 106/140] [ruby/json] Get rid of some more outdated
 compatibility code

All these macros are available on Ruby 2.3+

https://github.com/ruby/json/commit/227885f460
---
 ext/json/fbuffer/fbuffer.h     |  38 +-------
 ext/json/generator/generator.c |   6 +-
 ext/json/parser/parser.c       | 171 +++++++++++++++++----------------
 ext/json/parser/parser.rl      |  25 +++--
 4 files changed, 111 insertions(+), 129 deletions(-)

diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
index aed96d4e20e58a..76bd6ce1296f0b 100644
--- a/ext/json/fbuffer/fbuffer.h
+++ b/ext/json/fbuffer/fbuffer.h
@@ -1,43 +1,8 @@
-
 #ifndef _FBUFFER_H_
 #define _FBUFFER_H_
 
 #include "ruby.h"
-
-#ifndef RHASH_SIZE
-#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
-#endif
-
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
-#endif
-
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
-#endif
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
 #include "ruby/encoding.h"
-#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
-
-/* We don't need to guard objects for rbx, so let's do nothing at all. */
-#ifndef RB_GC_GUARD
-#define RB_GC_GUARD(object)
-#endif
 
 typedef struct FBufferStruct {
     unsigned long initial_length;
@@ -173,9 +138,8 @@ static void fbuffer_append_long(FBuffer *fb, long number)
 
 static VALUE fbuffer_to_s(FBuffer *fb)
 {
-    VALUE result = rb_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
+    VALUE result = rb_utf8_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
     fbuffer_free(fb);
-    FORCE_UTF8(result);
     return result;
 }
 #endif
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 576ab4e9c9f265..0af1592a7067a4 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -620,9 +620,9 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     VALUE tmp = rb_funcall(obj, i_to_s, 0);
     if (!allow_nan) {
         if (isinf(value)) {
-            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));
+            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", tmp);
         } else if (isnan(value)) {
-            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(tmp));
+            rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", tmp);
         }
     }
     fbuffer_append_str(buffer, tmp);
@@ -670,7 +670,7 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s
             default:
             general:
                 if (state->strict) {
-                    rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", RB_OBJ_STRING(CLASS_OF(obj)));
+                    rb_raise(eGeneratorError, "%"PRIsVALUE" not allowed in JSON", CLASS_OF(obj));
                 } else if (rb_respond_to(obj, i_to_json)) {
                     tmp = rb_funcall(obj, i_to_json, 1, Vstate);
                     Check_Type(tmp, T_STRING);
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index 37627edbd40baf..15b1daea753d85 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -78,12 +78,16 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
           i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
           i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
 
+static int binary_encindex;
+static int utf8_encindex;
 
-#line 105 "parser.rl"
 
 
+#line 109 "parser.rl"
 
-#line 87 "parser.c"
+
+
+#line 91 "parser.c"
 enum {JSON_object_start = 1};
 enum {JSON_object_first_final = 27};
 enum {JSON_object_error = 0};
@@ -91,7 +95,7 @@ enum {JSON_object_error = 0};
 enum {JSON_object_en_main = 1};
 
 
-#line 147 "parser.rl"
+#line 151 "parser.rl"
 
 
 static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -107,14 +111,14 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
     *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
 
 
-#line 111 "parser.c"
+#line 115 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
 
-#line 162 "parser.rl"
+#line 166 "parser.rl"
 
-#line 118 "parser.c"
+#line 122 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -142,7 +146,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 129 "parser.rl"
+#line 133 "parser.rl"
 	{
         char *np;
         json->parsing_name = 1;
@@ -155,7 +159,7 @@ case 2:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 159 "parser.c"
+#line 163 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -222,7 +226,7 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 113 "parser.rl"
+#line 117 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
@@ -243,7 +247,7 @@ case 8:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 247 "parser.c"
+#line 251 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
@@ -332,14 +336,14 @@ case 18:
 		goto st9;
 	goto st18;
 tr4:
-#line 137 "parser.rl"
+#line 141 "parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 343 "parser.c"
+#line 347 "parser.c"
 	goto st0;
 st19:
 	if ( ++p == pe )
@@ -437,7 +441,7 @@ case 26:
 	_out: {}
 	}
 
-#line 163 "parser.rl"
+#line 167 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         if (json->create_additions) {
@@ -462,7 +466,7 @@ case 26:
 
 
 
-#line 466 "parser.c"
+#line 470 "parser.c"
 enum {JSON_value_start = 1};
 enum {JSON_value_first_final = 29};
 enum {JSON_value_error = 0};
@@ -470,7 +474,7 @@ enum {JSON_value_error = 0};
 enum {JSON_value_en_main = 1};
 
 
-#line 263 "parser.rl"
+#line 267 "parser.rl"
 
 
 static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -478,14 +482,14 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
 
-#line 482 "parser.c"
+#line 486 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
 
-#line 270 "parser.rl"
+#line 274 "parser.rl"
 
-#line 489 "parser.c"
+#line 493 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -519,14 +523,14 @@ case 1:
 cs = 0;
 	goto _out;
 tr2:
-#line 215 "parser.rl"
+#line 219 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
         if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
 	goto st29;
 tr3:
-#line 220 "parser.rl"
+#line 224 "parser.rl"
 	{
         char *np;
         if(pe > p + 8 && !strncmp(MinusInfinity, p, 9)) {
@@ -546,7 +550,7 @@ cs = 0;
     }
 	goto st29;
 tr7:
-#line 238 "parser.rl"
+#line 242 "parser.rl"
 	{
         char *np;
         np = JSON_parse_array(json, p, pe, result, current_nesting + 1);
@@ -554,7 +558,7 @@ cs = 0;
     }
 	goto st29;
 tr11:
-#line 244 "parser.rl"
+#line 248 "parser.rl"
 	{
         char *np;
         np =  JSON_parse_object(json, p, pe, result, current_nesting + 1);
@@ -562,7 +566,7 @@ cs = 0;
     }
 	goto st29;
 tr25:
-#line 208 "parser.rl"
+#line 212 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CInfinity;
@@ -572,7 +576,7 @@ cs = 0;
     }
 	goto st29;
 tr27:
-#line 201 "parser.rl"
+#line 205 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CNaN;
@@ -582,19 +586,19 @@ cs = 0;
     }
 	goto st29;
 tr31:
-#line 195 "parser.rl"
+#line 199 "parser.rl"
 	{
         *result = Qfalse;
     }
 	goto st29;
 tr34:
-#line 192 "parser.rl"
+#line 196 "parser.rl"
 	{
         *result = Qnil;
     }
 	goto st29;
 tr37:
-#line 198 "parser.rl"
+#line 202 "parser.rl"
 	{
         *result = Qtrue;
     }
@@ -603,9 +607,9 @@ cs = 0;
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-#line 250 "parser.rl"
+#line 254 "parser.rl"
 	{ p--; {p++; cs = 29; goto _out;} }
-#line 609 "parser.c"
+#line 613 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st29;
 		case 32: goto st29;
@@ -846,7 +850,7 @@ case 28:
 	_out: {}
 	}
 
-#line 271 "parser.rl"
+#line 275 "parser.rl"
 
     if (json->freeze) {
         OBJ_FREEZE(*result);
@@ -860,7 +864,7 @@ case 28:
 }
 
 
-#line 864 "parser.c"
+#line 868 "parser.c"
 enum {JSON_integer_start = 1};
 enum {JSON_integer_first_final = 3};
 enum {JSON_integer_error = 0};
@@ -868,7 +872,7 @@ enum {JSON_integer_error = 0};
 enum {JSON_integer_en_main = 1};
 
 
-#line 291 "parser.rl"
+#line 295 "parser.rl"
 
 
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -876,15 +880,15 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
     int cs = EVIL;
 
 
-#line 880 "parser.c"
+#line 884 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
 
-#line 298 "parser.rl"
+#line 302 "parser.rl"
     json->memo = p;
 
-#line 888 "parser.c"
+#line 892 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -918,14 +922,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 288 "parser.rl"
+#line 292 "parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 929 "parser.c"
+#line 933 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -944,7 +948,7 @@ case 5:
 	_out: {}
 	}
 
-#line 300 "parser.rl"
+#line 304 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
@@ -959,7 +963,7 @@ case 5:
 }
 
 
-#line 963 "parser.c"
+#line 967 "parser.c"
 enum {JSON_float_start = 1};
 enum {JSON_float_first_final = 8};
 enum {JSON_float_error = 0};
@@ -967,7 +971,7 @@ enum {JSON_float_error = 0};
 enum {JSON_float_en_main = 1};
 
 
-#line 325 "parser.rl"
+#line 329 "parser.rl"
 
 
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -975,15 +979,15 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
 
-#line 979 "parser.c"
+#line 983 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
 
-#line 332 "parser.rl"
+#line 336 "parser.rl"
     json->memo = p;
 
-#line 987 "parser.c"
+#line 991 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1041,14 +1045,14 @@ case 8:
 		goto st0;
 	goto tr9;
 tr9:
-#line 319 "parser.rl"
+#line 323 "parser.rl"
 	{ p--; {p++; cs = 9; goto _out;} }
 	goto st9;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 1052 "parser.c"
+#line 1056 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -1109,7 +1113,7 @@ case 7:
 	_out: {}
 	}
 
-#line 334 "parser.rl"
+#line 338 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
         VALUE mod = Qnil;
@@ -1160,7 +1164,7 @@ case 7:
 
 
 
-#line 1164 "parser.c"
+#line 1168 "parser.c"
 enum {JSON_array_start = 1};
 enum {JSON_array_first_final = 17};
 enum {JSON_array_error = 0};
@@ -1168,7 +1172,7 @@ enum {JSON_array_error = 0};
 enum {JSON_array_en_main = 1};
 
 
-#line 412 "parser.rl"
+#line 416 "parser.rl"
 
 
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -1182,14 +1186,14 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
 
-#line 1186 "parser.c"
+#line 1190 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 
-#line 425 "parser.rl"
+#line 429 "parser.rl"
 
-#line 1193 "parser.c"
+#line 1197 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1228,7 +1232,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 389 "parser.rl"
+#line 393 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
@@ -1248,7 +1252,7 @@ case 2:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1252 "parser.c"
+#line 1256 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -1348,14 +1352,14 @@ case 12:
 		goto st3;
 	goto st12;
 tr4:
-#line 404 "parser.rl"
+#line 408 "parser.rl"
 	{ p--; {p++; cs = 17; goto _out;} }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 1359 "parser.c"
+#line 1363 "parser.c"
 	goto st0;
 st13:
 	if ( ++p == pe )
@@ -1411,7 +1415,7 @@ case 16:
 	_out: {}
 	}
 
-#line 426 "parser.rl"
+#line 430 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
@@ -1578,7 +1582,7 @@ static VALUE json_string_unescape(char *string, char *stringEnd, int intern, int
 }
 
 
-#line 1582 "parser.c"
+#line 1586 "parser.c"
 enum {JSON_string_start = 1};
 enum {JSON_string_first_final = 8};
 enum {JSON_string_error = 0};
@@ -1586,7 +1590,7 @@ enum {JSON_string_error = 0};
 enum {JSON_string_en_main = 1};
 
 
-#line 610 "parser.rl"
+#line 614 "parser.rl"
 
 
 static int
@@ -1607,15 +1611,15 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
     VALUE match_string;
 
 
-#line 1611 "parser.c"
+#line 1615 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 
-#line 630 "parser.rl"
+#line 634 "parser.rl"
     json->memo = p;
 
-#line 1619 "parser.c"
+#line 1623 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1640,7 +1644,7 @@ case 2:
 		goto st0;
 	goto st2;
 tr2:
-#line 597 "parser.rl"
+#line 601 "parser.rl"
 	{
         *result = json_string_unescape(json->memo + 1, p, json->parsing_name || json-> freeze, json->parsing_name && json->symbolize_names);
         if (NIL_P(*result)) {
@@ -1650,14 +1654,14 @@ case 2:
             {p = (( p + 1))-1;}
         }
     }
-#line 607 "parser.rl"
+#line 611 "parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1661 "parser.c"
+#line 1665 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -1733,7 +1737,7 @@ case 7:
 	_out: {}
 	}
 
-#line 632 "parser.rl"
+#line 636 "parser.rl"
 
     if (json->create_additions && RTEST(match_string = json->match_string)) {
           VALUE klass;
@@ -1767,18 +1771,20 @@ case 7:
 
 static VALUE convert_encoding(VALUE source)
 {
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *enc = rb_enc_get(source);
-  if (enc == rb_ascii8bit_encoding()) {
+  int encindex = RB_ENCODING_GET(source);
+
+  if (encindex == utf8_encindex) {
+    return source;
+  }
+
+ if (encindex == binary_encindex) {
     if (OBJ_FROZEN(source)) {
       source = rb_str_dup(source);
     }
-    FORCE_UTF8(source);
-  } else {
-    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+    return rb_enc_associate_index(source, utf8_encindex);
   }
-#endif
-    return source;
+
+  return rb_str_conv_enc(source, rb_enc_from_index(encindex), rb_utf8_encoding());
 }
 
 /*
@@ -1906,7 +1912,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 1910 "parser.c"
+#line 1916 "parser.c"
 enum {JSON_start = 1};
 enum {JSON_first_final = 10};
 enum {JSON_error = 0};
@@ -1914,7 +1920,7 @@ enum {JSON_error = 0};
 enum {JSON_en_main = 1};
 
 
-#line 818 "parser.rl"
+#line 824 "parser.rl"
 
 
 /*
@@ -1932,16 +1938,16 @@ static VALUE cParser_parse(VALUE self)
   GET_PARSER;
 
 
-#line 1936 "parser.c"
+#line 1942 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 835 "parser.rl"
+#line 841 "parser.rl"
   p = json->source;
   pe = p + json->len;
 
-#line 1945 "parser.c"
+#line 1951 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1975,7 +1981,7 @@ case 1:
 cs = 0;
 	goto _out;
 tr2:
-#line 810 "parser.rl"
+#line 816 "parser.rl"
 	{
         char *np = JSON_parse_value(json, p, pe, &result, 0);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -1985,7 +1991,7 @@ cs = 0;
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1989 "parser.c"
+#line 1995 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2074,7 +2080,7 @@ case 9:
 	_out: {}
 	}
 
-#line 838 "parser.rl"
+#line 844 "parser.rl"
 
   if (cs >= JSON_first_final && p == pe) {
     return result;
@@ -2186,6 +2192,9 @@ void Init_parser(void)
     i_try_convert = rb_intern("try_convert");
     i_freeze = rb_intern("freeze");
     i_uminus = rb_intern("-@");
+
+    binary_encindex = rb_ascii8bit_encindex();
+    utf8_encindex = rb_utf8_encindex();
 }
 
 /*
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index 7c41883d88fb31..7425204615bec0 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -76,6 +76,10 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
           i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
           i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
 
+static int binary_encindex;
+static int utf8_encindex;
+
+
 %%{
     machine JSON_common;
 
@@ -662,18 +666,20 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
 static VALUE convert_encoding(VALUE source)
 {
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *enc = rb_enc_get(source);
-  if (enc == rb_ascii8bit_encoding()) {
+  int encindex = RB_ENCODING_GET(source);
+
+  if (encindex == utf8_encindex) {
+    return source;
+  }
+
+ if (encindex == binary_encindex) {
     if (OBJ_FROZEN(source)) {
       source = rb_str_dup(source);
     }
-    FORCE_UTF8(source);
-  } else {
-    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+    return rb_enc_associate_index(source, utf8_encindex);
   }
-#endif
-    return source;
+
+  return rb_str_conv_enc(source, rb_enc_from_index(encindex), rb_utf8_encoding());
 }
 
 /*
@@ -946,6 +952,9 @@ void Init_parser(void)
     i_try_convert = rb_intern("try_convert");
     i_freeze = rb_intern("freeze");
     i_uminus = rb_intern("-@");
+
+    binary_encindex = rb_ascii8bit_encindex();
+    utf8_encindex = rb_utf8_encindex();
 }
 
 /*

From a7317f53e03059c946835d086d8def3f39649a8e Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 15:51:35 +0200
Subject: [PATCH 107/140] Add a fast path for ASCII strings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This optimization is based on a few assumptions:

  - Most strings are ASCII only.
  - Most strings had their coderange scanned already.

If the above is true, then by checking the string coderange, we can
use a much more streamlined function to encode ASCII strings.

Before:

```
== Encoding twitter.json (466906 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   140.000 i/100ms
                  oj   230.000 i/100ms
           rapidjson   108.000 i/100ms
Calculating -------------------------------------
                json      1.464k (± 1.4%) i/s  (682.83 μs/i) -      7.420k in   5.067573s
                  oj      2.338k (± 1.5%) i/s  (427.64 μs/i) -     11.730k in   5.017336s
           rapidjson      1.075k (± 1.6%) i/s  (930.40 μs/i) -      5.400k in   5.025469s

Comparison:
                json:     1464.5 i/s
                  oj:     2338.4 i/s - 1.60x  faster
           rapidjson:     1074.8 i/s - 1.36x  slower

```

After:

```
== Encoding twitter.json (466906 bytes)
ruby 3.4.0preview2 (2024-10-07 master 32c733f57b) +YJIT +PRISM [arm64-darwin23]
Warming up --------------------------------------
                json   189.000 i/100ms
                  oj   228.000 i/100ms
           rapidjson   108.000 i/100ms
Calculating -------------------------------------
                json      1.903k (± 1.2%) i/s  (525.55 μs/i) -      9.639k in   5.066521s
                  oj      2.306k (± 1.3%) i/s  (433.71 μs/i) -     11.628k in   5.044096s
           rapidjson      1.069k (± 2.4%) i/s  (935.38 μs/i) -      5.400k in   5.053794s

Comparison:
                json:     1902.8 i/s
                  oj:     2305.7 i/s - 1.21x  faster
           rapidjson:     1069.1 i/s - 1.78x  slower
```
---
 ext/json/generator/generator.c | 215 ++++++++++++++++++++++++++++-----
 ext/json/generator/generator.h |   1 -
 2 files changed, 185 insertions(+), 31 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 0af1592a7067a4..b9946b3cf72722 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -25,14 +25,13 @@ static ID i_to_s, i_to_json, i_new, i_pack, i_unpack, i_create_id, i_extend;
  * Everything else (should be UTF-8) is just passed through and
  * appended to the result.
  */
-static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_ascii_only, bool out_script_safe)
+static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_script_safe)
 {
     const char *hexdig = "0123456789abcdef";
     char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
 
     const char *in_utf8_str = RSTRING_PTR(in_string);
     unsigned long in_utf8_len = RSTRING_LEN(in_string);
-    bool in_is_ascii_only = rb_enc_str_asciionly_p(in_string);
 
     unsigned long beg = 0, pos;
 
@@ -42,46 +41,183 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_
         bool should_escape;
 
         /* UTF-8 decoding */
-        if (in_is_ascii_only) {
-            ch = in_utf8_str[pos];
-            ch_len = 1;
-        } else {
-            short i;
-            if      ((in_utf8_str[pos] & 0x80) == 0x00) { ch_len = 1; ch = in_utf8_str[pos];        } /* leading 1 bit is   0b0     */
-            else if ((in_utf8_str[pos] & 0xE0) == 0xC0) { ch_len = 2; ch = in_utf8_str[pos] & 0x1F; } /* leading 3 bits are 0b110   */
-            else if ((in_utf8_str[pos] & 0xF0) == 0xE0) { ch_len = 3; ch = in_utf8_str[pos] & 0x0F; } /* leading 4 bits are 0b1110  */
-            else if ((in_utf8_str[pos] & 0xF8) == 0xF0) { ch_len = 4; ch = in_utf8_str[pos] & 0x07; } /* leading 5 bits are 0b11110 */
-            else
-                rb_raise(rb_path2class("JSON::GeneratorError"),
-                         "source sequence is illegal/malformed utf-8");
-            if ((pos+ch_len) > in_utf8_len)
-                rb_raise(rb_path2class("JSON::GeneratorError"),
-                         "partial character in source, but hit end");
-            for (i = 1; i < ch_len; i++) {
-                if ((in_utf8_str[pos+i] & 0xC0) != 0x80) /* leading 2 bits should be 0b10 */
-                    rb_raise(rb_path2class("JSON::GeneratorError"),
-                             "source sequence is illegal/malformed utf-8");
-                ch = (ch<<6) | (in_utf8_str[pos+i] & 0x3F);
+        short i;
+        if      ((in_utf8_str[pos] & 0x80) == 0x00) { ch_len = 1; ch = in_utf8_str[pos];        } /* leading 1 bit is   0b0     */
+        else if ((in_utf8_str[pos] & 0xE0) == 0xC0) { ch_len = 2; ch = in_utf8_str[pos] & 0x1F; } /* leading 3 bits are 0b110   */
+        else if ((in_utf8_str[pos] & 0xF0) == 0xE0) { ch_len = 3; ch = in_utf8_str[pos] & 0x0F; } /* leading 4 bits are 0b1110  */
+        else if ((in_utf8_str[pos] & 0xF8) == 0xF0) { ch_len = 4; ch = in_utf8_str[pos] & 0x07; } /* leading 5 bits are 0b11110 */
+        else {
+            rb_raise(rb_path2class("JSON::GeneratorError"), "source sequence is illegal/malformed utf-8");
+        }
+
+        for (i = 1; i < ch_len; i++) {
+            ch = (ch<<6) | (in_utf8_str[pos+i] & 0x3F);
+        }
+
+        /* JSON policy */
+        should_escape =
+            (ch < 0x20) ||
+            (ch == '"') ||
+            (ch == '\\') ||
+            (out_script_safe && (ch == '/')) ||
+            (out_script_safe && (ch == 0x2028)) ||
+            (out_script_safe && (ch == 0x2029));
+
+        /* JSON encoding */
+        if (should_escape) {
+            if (pos > beg) {
+                fbuffer_append(out_buffer, &in_utf8_str[beg], pos - beg);
+            }
+
+            beg = pos + ch_len;
+            switch (ch) {
+                case '"':  fbuffer_append(out_buffer, "\\\"", 2); break;
+                case '\\': fbuffer_append(out_buffer, "\\\\", 2); break;
+                case '/':  fbuffer_append(out_buffer, "\\/", 2); break;
+                case '\b': fbuffer_append(out_buffer, "\\b", 2); break;
+                case '\f': fbuffer_append(out_buffer, "\\f", 2); break;
+                case '\n': fbuffer_append(out_buffer, "\\n", 2); break;
+                case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
+                case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
+                default:
+                    if (ch <= 0xFFFF) {
+                        scratch[2] = hexdig[ch >> 12];
+                        scratch[3] = hexdig[(ch >> 8) & 0xf];
+                        scratch[4] = hexdig[(ch >> 4) & 0xf];
+                        scratch[5] = hexdig[ch & 0xf];
+                        fbuffer_append(out_buffer, scratch, 6);
+                    } else {
+                        uint16_t hi, lo;
+                        ch -= 0x10000;
+                        hi = 0xD800 + (uint16_t)(ch >> 10);
+                        lo = 0xDC00 + (uint16_t)(ch & 0x3FF);
+
+                        scratch[2] = hexdig[hi >> 12];
+                        scratch[3] = hexdig[(hi >> 8) & 0xf];
+                        scratch[4] = hexdig[(hi >> 4) & 0xf];
+                        scratch[5] = hexdig[hi & 0xf];
+
+                        scratch[8] = hexdig[lo >> 12];
+                        scratch[9] = hexdig[(lo >> 8) & 0xf];
+                        scratch[10] = hexdig[(lo >> 4) & 0xf];
+                        scratch[11] = hexdig[lo & 0xf];
+
+                        fbuffer_append(out_buffer, scratch, 12);
+                    }
             }
-            if (ch > 0x10FFFF)
-                rb_raise(rb_path2class("JSON::GeneratorError"),
-                         "source sequence is illegal/malformed utf-8");
         }
 
+        pos += ch_len;
+    }
+
+    if (beg < in_utf8_len) {
+        fbuffer_append(out_buffer, &in_utf8_str[beg], in_utf8_len - beg);
+    }
+
+    RB_GC_GUARD(in_string);
+}
+
+static void convert_ASCII_to_JSON(FBuffer *out_buffer, VALUE str, bool out_script_safe)
+{
+    const char *hexdig = "0123456789abcdef";
+    char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
+
+    const char *ptr = RSTRING_PTR(str);
+    unsigned long len = RSTRING_LEN(str);
+
+    unsigned long beg = 0, pos;
+
+    for (pos = 0; pos < len;) {
+        unsigned char ch = ptr[pos];
+        bool should_escape;
+
         /* JSON policy */
         should_escape =
             (ch < 0x20) ||
             (ch == '"') ||
             (ch == '\\') ||
-            (out_ascii_only && (ch > 0x7F)) ||
+            (out_script_safe && (ch == '/'));
+
+        /* JSON encoding */
+        if (should_escape) {
+            if (pos > beg) {
+                fbuffer_append(out_buffer, &ptr[beg], pos - beg);
+            }
+
+            beg = pos + 1;
+            switch (ch) {
+                case '"':  fbuffer_append(out_buffer, "\\\"", 2); break;
+                case '\\': fbuffer_append(out_buffer, "\\\\", 2); break;
+                case '/':  fbuffer_append(out_buffer, "\\/", 2); break;
+                case '\b': fbuffer_append(out_buffer, "\\b", 2); break;
+                case '\f': fbuffer_append(out_buffer, "\\f", 2); break;
+                case '\n': fbuffer_append(out_buffer, "\\n", 2); break;
+                case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
+                case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
+                default:
+                    scratch[2] = hexdig[ch >> 12];
+                    scratch[3] = hexdig[(ch >> 8) & 0xf];
+                    scratch[4] = hexdig[(ch >> 4) & 0xf];
+                    scratch[5] = hexdig[ch & 0xf];
+                    fbuffer_append(out_buffer, scratch, 6);
+            }
+        }
+
+        pos++;
+    }
+
+    if (beg < len) {
+        fbuffer_append(out_buffer, &ptr[beg], len - beg);
+    }
+
+    RB_GC_GUARD(str);
+}
+
+static void convert_UTF8_to_ASCII_only_JSON(FBuffer *out_buffer, VALUE in_string, bool out_script_safe)
+{
+    const char *hexdig = "0123456789abcdef";
+    char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
+
+    const char *in_utf8_str = RSTRING_PTR(in_string);
+    unsigned long in_utf8_len = RSTRING_LEN(in_string);
+
+    unsigned long beg = 0, pos;
+
+    for (pos =  0; pos < in_utf8_len;) {
+        uint32_t ch;
+        short ch_len;
+        bool should_escape;
+
+        /* UTF-8 decoding */
+        short i;
+        if      ((in_utf8_str[pos] & 0x80) == 0x00) { ch_len = 1; ch = in_utf8_str[pos];        } /* leading 1 bit is   0b0     */
+        else if ((in_utf8_str[pos] & 0xE0) == 0xC0) { ch_len = 2; ch = in_utf8_str[pos] & 0x1F; } /* leading 3 bits are 0b110   */
+        else if ((in_utf8_str[pos] & 0xF0) == 0xE0) { ch_len = 3; ch = in_utf8_str[pos] & 0x0F; } /* leading 4 bits are 0b1110  */
+        else if ((in_utf8_str[pos] & 0xF8) == 0xF0) { ch_len = 4; ch = in_utf8_str[pos] & 0x07; } /* leading 5 bits are 0b11110 */
+        else {
+            rb_raise(rb_path2class("JSON::GeneratorError"), "source sequence is illegal/malformed utf-8");
+        }
+
+        for (i = 1; i < ch_len; i++) {
+            ch = (ch<<6) | (in_utf8_str[pos+i] & 0x3F);
+        }
+
+        /* JSON policy */
+        should_escape =
+            (ch < 0x20) ||
+            (ch == '"') ||
+            (ch == '\\') ||
+            (ch > 0x7F) ||
             (out_script_safe && (ch == '/')) ||
             (out_script_safe && (ch == 0x2028)) ||
             (out_script_safe && (ch == 0x2029));
 
         /* JSON encoding */
         if (should_escape) {
-            if (pos > beg)
+            if (pos > beg) {
                 fbuffer_append(out_buffer, &in_utf8_str[beg], pos - beg);
+            }
+
             beg = pos + ch_len;
             switch (ch) {
                 case '"':  fbuffer_append(out_buffer, "\\\"", 2); break;
@@ -122,8 +258,11 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_
 
         pos += ch_len;
     }
-    if (beg < in_utf8_len)
+
+    if (beg < in_utf8_len) {
         fbuffer_append(out_buffer, &in_utf8_str[beg], in_utf8_len - beg);
+    }
+
     RB_GC_GUARD(in_string);
 }
 
@@ -570,11 +709,27 @@ static int enc_utf8_compatible_p(int enc_idx)
 
 static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
-    fbuffer_append_char(buffer, '"');
     if (!enc_utf8_compatible_p(RB_ENCODING_GET(obj))) {
         obj = rb_str_export_to_enc(obj, rb_utf8_encoding());
     }
-    convert_UTF8_to_JSON(buffer, obj, state->ascii_only, state->script_safe);
+
+    fbuffer_append_char(buffer, '"');
+
+    switch(rb_enc_str_coderange(obj)) {
+        case ENC_CODERANGE_7BIT:
+            convert_ASCII_to_JSON(buffer, obj, state->script_safe);
+            break;
+        case ENC_CODERANGE_VALID:
+            if (RB_UNLIKELY(state->ascii_only)) {
+                convert_UTF8_to_ASCII_only_JSON(buffer, obj, state->script_safe);
+            } else {
+                convert_UTF8_to_JSON(buffer, obj, state->script_safe);
+            }
+            break;
+        default:
+            rb_raise(rb_path2class("JSON::GeneratorError"), "source sequence is illegal/malformed utf-8");
+            break;
+    }
     fbuffer_append_char(buffer, '"');
 }
 
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 09bf68079c9c25..0553277fa60669 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -23,7 +23,6 @@ typedef unsigned char _Bool;
 #endif
 #endif
 
-static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_ascii_only, bool out_script_safe);
 static char *fstrndup(const char *ptr, unsigned long len);
 
 /* ruby api and some helpers */

From c6828a10ff6fd57a7e909438a4ff18ffcd9ce4ec Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Thu, 17 Oct 2024 11:37:45 -0400
Subject: [PATCH 108/140] Update maintainers of Prism

---
 doc/maintainers.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/maintainers.md b/doc/maintainers.md
index fa2c24140b4944..0bdfdc268355bb 100644
--- a/doc/maintainers.md
+++ b/doc/maintainers.md
@@ -199,7 +199,8 @@ have commit right, others don't.
 
 #### lib/prism.rb
 * Kevin Newton (kddnewton)
-* Jemma Issroff (jemmaissroff)
+* Eileen Uchitelle (eileencodes)
+* Aaron Patterson (tenderlove)
 * https://github.com/ruby/prism
 * https://rubygems.org/gems/prism
 

From e4330536d2f4a9b96e52a60b9d698625ab26a547 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 17 Oct 2024 13:39:48 -0400
Subject: [PATCH 109/140] [ruby/json] Fix State#max_nesting=

Returning state->max_nesting is not valid because it's not a Ruby object.

https://github.com/ruby/json/commit/6679ceb
---
 ext/json/generator/generator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index b9946b3cf72722..ead772994bd6a5 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -1164,7 +1164,8 @@ static VALUE cState_max_nesting_set(VALUE self, VALUE depth)
 {
     GET_STATE(self);
     Check_Type(depth, T_FIXNUM);
-    return state->max_nesting = FIX2LONG(depth);
+    state->max_nesting = FIX2LONG(depth);
+    return Qnil;
 }
 
 /*

From 48899d56a9c61d4a3e5fe822ed7c16a1f2868bd4 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Thu, 17 Oct 2024 13:44:40 -0400
Subject: [PATCH 110/140] [ruby/json] Sync changes

Some changes were missed in the automatic sync.
---
 ext/json/generator/generator.c | 37 +++++++++++++++++++++++-----------
 ext/json/parser/parser.c       | 21 +++++++++----------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index ead772994bd6a5..815fd973d79f31 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -117,7 +117,29 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_
     RB_GC_GUARD(in_string);
 }
 
-static void convert_ASCII_to_JSON(FBuffer *out_buffer, VALUE str, bool out_script_safe)
+static const bool escape_table[256] = {
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* '"'  */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0, /* '\\' */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+};
+
+static const bool script_safe_escape_table[256] = {
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* '"' and '/' */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0, /* '\\' */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+};
+
+static void convert_ASCII_to_JSON(FBuffer *out_buffer, VALUE str, const bool escape_table[256])
 {
     const char *hexdig = "0123456789abcdef";
     char scratch[12] = { '\\', 'u', 0, 0, 0, 0, '\\', 'u' };
@@ -129,17 +151,8 @@ static void convert_ASCII_to_JSON(FBuffer *out_buffer, VALUE str, bool out_scrip
 
     for (pos = 0; pos < len;) {
         unsigned char ch = ptr[pos];
-        bool should_escape;
-
-        /* JSON policy */
-        should_escape =
-            (ch < 0x20) ||
-            (ch == '"') ||
-            (ch == '\\') ||
-            (out_script_safe && (ch == '/'));
-
         /* JSON encoding */
-        if (should_escape) {
+        if (escape_table[ch]) {
             if (pos > beg) {
                 fbuffer_append(out_buffer, &ptr[beg], pos - beg);
             }
@@ -717,7 +730,7 @@ static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
 
     switch(rb_enc_str_coderange(obj)) {
         case ENC_CODERANGE_7BIT:
-            convert_ASCII_to_JSON(buffer, obj, state->script_safe);
+            convert_ASCII_to_JSON(buffer, obj, state->script_safe ? script_safe_escape_table : escape_table);
             break;
         case ENC_CODERANGE_VALID:
             if (RB_UNLIKELY(state->ascii_only)) {
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index 15b1daea753d85..a1947314f81923 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -1778,10 +1778,7 @@ static VALUE convert_encoding(VALUE source)
   }
 
  if (encindex == binary_encindex) {
-    if (OBJ_FROZEN(source)) {
-      source = rb_str_dup(source);
-    }
-    return rb_enc_associate_index(source, utf8_encindex);
+    return rb_enc_associate_index(rb_str_dup(source), utf8_encindex);
   }
 
   return rb_str_conv_enc(source, rb_enc_from_index(encindex), rb_utf8_encoding());
@@ -1912,7 +1909,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 1916 "parser.c"
+#line 1913 "parser.c"
 enum {JSON_start = 1};
 enum {JSON_first_final = 10};
 enum {JSON_error = 0};
@@ -1920,7 +1917,7 @@ enum {JSON_error = 0};
 enum {JSON_en_main = 1};
 
 
-#line 824 "parser.rl"
+#line 821 "parser.rl"
 
 
 /*
@@ -1938,16 +1935,16 @@ static VALUE cParser_parse(VALUE self)
   GET_PARSER;
 
 
-#line 1942 "parser.c"
+#line 1939 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 841 "parser.rl"
+#line 838 "parser.rl"
   p = json->source;
   pe = p + json->len;
 
-#line 1951 "parser.c"
+#line 1948 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1981,7 +1978,7 @@ case 1:
 cs = 0;
 	goto _out;
 tr2:
-#line 816 "parser.rl"
+#line 813 "parser.rl"
 	{
         char *np = JSON_parse_value(json, p, pe, &result, 0);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -1991,7 +1988,7 @@ cs = 0;
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1995 "parser.c"
+#line 1992 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2080,7 +2077,7 @@ case 9:
 	_out: {}
 	}
 
-#line 844 "parser.rl"
+#line 841 "parser.rl"
 
   if (cs >= JSON_first_final && p == pe) {
     return result;

From 0b38e184881839d347a777e82ad1b037a1aeca6e Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Thu, 17 Oct 2024 16:40:30 -0400
Subject: [PATCH 111/140] [ruby/rdoc] feature: Render mixed-in methods and
 constants with `--embed-mixins` (https://github.com/ruby/rdoc/pull/842)

* Embed mixed-in methods and constants with `--embed-mixins`

When `--embed-mixins` option is set:

- methods from an `extend`ed module are documented as singleton methods
- attrs from an `extend`ed module are documented as class attributes
- methods from an `include`ed module are documented as instance methods
- attrs from an `include`ed module are documented as instance attributes
- constants from an `include`ed module are documented

Sections are created when needed, and Darkfish's template annotates
each of these mixed-in CodeObjects. We also respect the mixin methods'
visibility.

This feature is inspired by Yard's option of the same name.

* Add comment to document why we set object visibility

Co-authored-by: Stan Lo <stan001212@gmail.com>

* Add the mixin_from attribute to CodeObject's initializer

* Add test coverage for private mixed-in attributes.

---------

https://github.com/ruby/rdoc/commit/481c2ce660

Co-authored-by: Stan Lo <stan001212@gmail.com>
---
 lib/rdoc/code_object.rb                       |   6 +
 lib/rdoc/code_object/class_module.rb          |  40 ++++++
 .../generator/template/darkfish/class.rhtml   |  18 ++-
 .../generator/template/darkfish/css/rdoc.css  |   7 +
 lib/rdoc/options.rb                           |  19 ++-
 test/rdoc/test_rdoc_class_module.rb           | 136 ++++++++++++++++++
 test/rdoc/test_rdoc_options.rb                |  15 ++
 7 files changed, 239 insertions(+), 2 deletions(-)

diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb
index aeb4b4762e88da..83997c2580e723 100644
--- a/lib/rdoc/code_object.rb
+++ b/lib/rdoc/code_object.rb
@@ -96,6 +96,11 @@ class RDoc::CodeObject
 
   attr_accessor :viewer
 
+  ##
+  # When mixed-in to a class, this points to the Context in which it was originally defined.
+
+  attr_accessor :mixin_from
+
   ##
   # Creates a new CodeObject that will document itself and its children
 
@@ -111,6 +116,7 @@ def initialize
     @full_name        = nil
     @store            = nil
     @track_visibility = true
+    @mixin_from       = nil
 
     initialize_visibility
   end
diff --git a/lib/rdoc/code_object/class_module.rb b/lib/rdoc/code_object/class_module.rb
index c69e14b5e4ba0b..a99acb895634fb 100644
--- a/lib/rdoc/code_object/class_module.rb
+++ b/lib/rdoc/code_object/class_module.rb
@@ -223,6 +223,7 @@ def comment= comment # :nodoc:
   def complete min_visibility
     update_aliases
     remove_nodoc_children
+    embed_mixins
     update_includes
     remove_invisible min_visibility
   end
@@ -798,4 +799,43 @@ def update_extends
     extends.uniq!
   end
 
+  def embed_mixins
+    return unless options.embed_mixins
+
+    includes.each do |include|
+      next if String === include.module
+      include.module.method_list.each do |code_object|
+        add_method(prepare_to_embed(code_object))
+      end
+      include.module.constants.each do |code_object|
+        add_constant(prepare_to_embed(code_object))
+      end
+      include.module.attributes.each do |code_object|
+        add_attribute(prepare_to_embed(code_object))
+      end
+    end
+
+    extends.each do |ext|
+      next if String === ext.module
+      ext.module.method_list.each do |code_object|
+        add_method(prepare_to_embed(code_object, true))
+      end
+      ext.module.attributes.each do |code_object|
+        add_attribute(prepare_to_embed(code_object, true))
+      end
+    end
+  end
+
+  private
+
+  def prepare_to_embed(code_object, singleton=false)
+    code_object = code_object.dup
+    code_object.mixin_from = code_object.parent
+    code_object.singleton = true if singleton
+    set_current_section(code_object.section.title, code_object.section.comment)
+    # add_method and add_attribute will reassign self's visibility back to the method/attribute
+    # so we need to sync self's visibility with the object's to properly retain that information
+    self.visibility = code_object.visibility
+    code_object
+  end
 end
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
index 85fb0c1c33b693..0bec9fc9ce3d87 100644
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ b/lib/rdoc/generator/template/darkfish/class.rhtml
@@ -54,7 +54,13 @@
       <%- constants.each do |const| -%>
         <dt id="<%= const.name %>"><%= const.name %>
         <%- if const.comment then -%>
-        <dd><%= const.description.strip %>
+        <dd>
+          <%- if const.mixin_from then -%>
+            <div class="mixin-from">
+              Included from <a href="<%= klass.aref_to(const.mixin_from.path)%>"><%= const.mixin_from.full_name %></a>
+            </div>
+          <%- end -%>
+          <%= const.description.strip %>
         <%- else -%>
         <dd class="missing-docs">(Not documented)
         <%- end -%>
@@ -79,6 +85,11 @@
         </div>
 
         <div class="method-description">
+        <%- if attrib.mixin_from then -%>
+          <div class="mixin-from">
+            <%= attrib.singleton ? "Extended" : "Included" %> from <a href="<%= klass.aref_to(attrib.mixin_from.path)%>"><%= attrib.mixin_from.full_name %></a>
+          </div>
+        <%- end -%>
         <%- if attrib.comment then -%>
         <%= attrib.description.strip %>
         <%- else -%>
@@ -145,6 +156,11 @@
             <pre><%= method.markup_code %></pre>
           </div>
           <%- end -%>
+          <%- if method.mixin_from then -%>
+            <div class="mixin-from">
+              <%= method.singleton ? "Extended" : "Included" %> from <a href="<%= klass.aref_to(method.mixin_from.path)%>"><%= method.mixin_from.full_name %></a>
+            </div>
+          <%- end -%>
           <%- if method.comment then -%>
           <%= method.description.strip %>
           <%- else -%>
diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css
index 49138c6292e48b..a4e1ef188ce4c5 100644
--- a/lib/rdoc/generator/template/darkfish/css/rdoc.css
+++ b/lib/rdoc/generator/template/darkfish/css/rdoc.css
@@ -670,6 +670,13 @@ main .aliases {
   font-style: italic;
   cursor: default;
 }
+
+main .mixin-from {
+  font-size: 80%;
+  font-style: italic;
+  margin-bottom: 0.75em;
+}
+
 main .method-description ul {
   margin-left: 1.5em;
 }
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 2631d57364171c..a607a76d56195b 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -344,6 +344,11 @@ class RDoc::Options
   # Indicates if files of test suites should be skipped
   attr_accessor :skip_tests
 
+  ##
+  # Embed mixin methods, attributes, and constants into class documentation. Set via
+  # +--[no-]embed-mixins+ (Default is +false+.)
+  attr_accessor :embed_mixins
+
   def initialize loaded_options = nil # :nodoc:
     init_ivars
     override loaded_options if loaded_options
@@ -351,6 +356,7 @@ def initialize loaded_options = nil # :nodoc:
 
   def init_ivars # :nodoc:
     @dry_run = false
+    @embed_mixins = false
     @exclude = %w[
       ~\z \.orig\z \.rej\z \.bak\z
       \.gemspec\z
@@ -401,6 +407,7 @@ def init_with map # :nodoc:
     @encoding = encoding ? Encoding.find(encoding) : encoding
 
     @charset        = map['charset']
+    @embed_mixins   = map['embed_mixins']
     @exclude        = map['exclude']
     @generator_name = map['generator_name']
     @hyperlink_all  = map['hyperlink_all']
@@ -432,6 +439,7 @@ def override map # :nodoc:
     end
 
     @charset        = map['charset']        if map.has_key?('charset')
+    @embed_mixins   = map['embed_mixins']   if map.has_key?('embed_mixins')
     @exclude        = map['exclude']        if map.has_key?('exclude')
     @generator_name = map['generator_name'] if map.has_key?('generator_name')
     @hyperlink_all  = map['hyperlink_all']  if map.has_key?('hyperlink_all')
@@ -460,11 +468,12 @@ def override map # :nodoc:
   def == other # :nodoc:
     self.class === other and
       @encoding       == other.encoding       and
+      @embed_mixins   == other.embed_mixins   and
       @generator_name == other.generator_name and
       @hyperlink_all  == other.hyperlink_all  and
       @line_numbers   == other.line_numbers   and
       @locale         == other.locale         and
-      @locale_dir     == other.locale_dir and
+      @locale_dir     == other.locale_dir     and
       @main_page      == other.main_page      and
       @markup         == other.markup         and
       @op_dir         == other.op_dir         and
@@ -842,6 +851,14 @@ def parse argv
 
       opt.separator nil
 
+      opt.on("--[no-]embed-mixins",
+             "Embed mixin methods, attributes, and constants",
+             "into class documentation. (default false)") do |value|
+        @embed_mixins = value
+      end
+
+      opt.separator nil
+
       markup_formats = RDoc::Text::MARKUP_FORMAT.keys.sort
 
       opt.on("--markup=MARKUP", markup_formats,
diff --git a/test/rdoc/test_rdoc_class_module.rb b/test/rdoc/test_rdoc_class_module.rb
index 27d37cb7dd5932..d70a3ea033f120 100644
--- a/test/rdoc/test_rdoc_class_module.rb
+++ b/test/rdoc/test_rdoc_class_module.rb
@@ -1500,4 +1500,140 @@ def test_update_extends_with_colons
     assert_equal [a, c], @c1.extends
   end
 
+  class TestRDocClassModuleMixins < XrefTestCase
+    def setup
+      super
+
+      klass_tl = @store.add_file("klass.rb")
+      @klass = klass_tl.add_class(RDoc::NormalClass, "Klass")
+
+      incmod_tl = @store.add_file("incmod.rb")
+      @incmod = incmod_tl.add_module(RDoc::NormalModule, "Incmod")
+
+      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST_WITHOUT_A_SECTION", nil, ""))
+      incmod_const = @incmod.add_constant(RDoc::Constant.new("INCMOD_CONST", nil, ""))
+      incmod_const.section = @incmod.add_section("Incmod const section")
+
+      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method_without_a_section"))
+      incmod_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_method"))
+      incmod_method.section = @incmod.add_section("Incmod method section")
+
+      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr_without_a_section", "RW", ""))
+      incmod_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_attr", "RW", ""))
+      incmod_attr.section = @incmod.add_section("Incmod attr section")
+
+      incmod_private_method = @incmod.add_method(RDoc::AnyMethod.new(nil, "incmod_private_method"))
+      incmod_private_method.visibility = :private
+
+      incmod_private_attr = @incmod.add_attribute(RDoc::Attr.new(nil, "incmod_private_attr", "RW", ""))
+      incmod_private_attr.visibility = :private
+
+      extmod_tl = @store.add_file("extmod.rb")
+      @extmod = extmod_tl.add_module(RDoc::NormalModule, "Extmod")
+
+      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method_without_a_section"))
+      extmod_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_method"))
+      extmod_method.section = @extmod.add_section("Extmod method section")
+
+      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr_without_a_section", "RW", "", true))
+      extmod_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_attr", "RW", "", true))
+      extmod_attr.section = @extmod.add_section("Extmod attr section")
+
+      extmod_private_method = @extmod.add_method(RDoc::AnyMethod.new(nil, "extmod_private_method"))
+      extmod_private_method.visibility = :private
+
+      extmod_private_attr = @extmod.add_attribute(RDoc::Attr.new(nil, "extmod_private_attr", "RW", "", true))
+      extmod_private_attr.visibility = :private
+
+      @klass.add_include(RDoc::Include.new("Incmod", nil))
+      @klass.add_extend(RDoc::Include.new("Extmod", nil))
+
+      @klass.add_include(RDoc::Include.new("ExternalInclude", nil))
+      @klass.add_extend(RDoc::Include.new("ExternalExtend", nil))
+    end
+
+    def test_embed_mixin_when_false_does_not_embed_anything
+      assert_false(@klass.options.embed_mixins)
+      @klass.complete(:protected)
+
+      refute_includes(@klass.constants.map(&:name), "INCMOD_CONST")
+      refute_includes(@klass.method_list.map(&:name), "incmod_method")
+      refute_includes(@klass.method_list.map(&:name), "extmod_method")
+      refute_includes(@klass.attributes.map(&:name), "incmod_attr")
+      refute_includes(@klass.attributes.map(&:name), "extmod_attr")
+    end
+
+    def test_embed_mixin_when_true_embeds_methods_and_constants
+      @klass.options.embed_mixins = true
+      @klass.complete(:protected)
+
+      # assert on presence and identity of methods and constants
+      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST" }
+      assert(constant, "constant from included mixin should be present")
+      assert_equal(@incmod, constant.mixin_from)
+
+      instance_method = @klass.method_list.find { |m| m.name == "incmod_method" }
+      assert(instance_method, "instance method from included mixin should be present")
+      refute(instance_method.singleton)
+      assert_equal(@incmod, instance_method.mixin_from)
+
+      instance_attr = @klass.attributes.find { |a| a.name == "incmod_attr" }
+      assert(instance_attr, "instance attr from included mixin should be present")
+      refute(instance_attr.singleton)
+      assert_equal(@incmod, instance_attr.mixin_from)
+
+      refute(@klass.method_list.find { |m| m.name == "incmod_private_method" })
+      refute(@klass.attributes.find { |m| m.name == "incmod_private_attr" })
+
+      class_method = @klass.method_list.find { |m| m.name == "extmod_method" }
+      assert(class_method, "class method from extended mixin should be present")
+      assert(class_method.singleton)
+      assert_equal(@extmod, class_method.mixin_from)
+
+      class_attr = @klass.attributes.find { |a| a.name == "extmod_attr" }
+      assert(class_attr, "class attr from extended mixin should be present")
+      assert(class_attr.singleton)
+      assert_equal(@extmod, class_attr.mixin_from)
+
+      refute(@klass.method_list.find { |m| m.name == "extmod_private_method" })
+      refute(@klass.attributes.find { |m| m.name == "extmod_private_attr" })
+
+      # assert that sections are also imported
+      constant_section = @klass.sections.find { |s| s.title == "Incmod const section" }
+      assert(constant_section, "constant from included mixin should have a section")
+      assert_equal(constant_section, constant.section)
+
+      instance_method_section = @klass.sections.find { |s| s.title == "Incmod method section" }
+      assert(instance_method_section, "instance method from included mixin should have a section")
+      assert_equal(instance_method_section, instance_method.section)
+
+      instance_attr_section = @klass.sections.find { |s| s.title == "Incmod attr section" }
+      assert(instance_attr_section, "instance attr from included mixin should have a section")
+      assert_equal(instance_attr_section, instance_attr.section)
+
+      class_method_section = @klass.sections.find { |s| s.title == "Extmod method section" }
+      assert(class_method_section, "class method from extended mixin should have a section")
+      assert_equal(class_method_section, class_method.section)
+
+      class_attr_section = @klass.sections.find { |s| s.title == "Extmod attr section" }
+      assert(class_attr_section, "class attr from extended mixin should have a section")
+      assert_equal(class_attr_section, class_attr.section)
+
+      # and check that code objects without a section still have no section
+      constant = @klass.constants.find { |c| c.name == "INCMOD_CONST_WITHOUT_A_SECTION" }
+      assert_nil(constant.section.title)
+
+      instance_method = @klass.method_list.find { |c| c.name == "incmod_method_without_a_section" }
+      assert_nil(instance_method.section.title)
+
+      instance_attr = @klass.attributes.find { |c| c.name == "incmod_attr_without_a_section" }
+      assert_nil(instance_attr.section.title)
+
+      class_method = @klass.method_list.find { |c| c.name == "extmod_method_without_a_section" }
+      assert_nil(class_method.section.title)
+
+      class_attr = @klass.attributes.find { |c| c.name == "extmod_attr_without_a_section" }
+      assert_nil(class_attr.section.title)
+    end
+  end
 end
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
index 5e8b1ae3d8b9c5..1fc56b2d5ec85e 100644
--- a/test/rdoc/test_rdoc_options.rb
+++ b/test/rdoc/test_rdoc_options.rb
@@ -65,6 +65,7 @@ def test_to_yaml
     expected = {
       'charset'              => 'UTF-8',
       'encoding'             => encoding,
+      'embed_mixins'         => false,
       'exclude'              => %w[~\z \.orig\z \.rej\z \.bak\z \.gemspec\z],
       'hyperlink_all'        => false,
       'line_numbers'         => false,
@@ -589,6 +590,20 @@ def test_parse_root
     assert_includes @options.rdoc_include, @options.root.to_s
   end
 
+  def test_parse_embed_mixins
+    assert_false(@options.embed_mixins)
+
+    out, err = capture_output { @options.parse(["--embed-mixins"]) }
+    assert_empty(out)
+    assert_empty(err)
+    assert_true(@options.embed_mixins)
+
+    out, err = capture_output { @options.parse(["--no-embed-mixins"]) }
+    assert_empty(out)
+    assert_empty(err)
+    assert_false(@options.embed_mixins)
+  end
+
   def test_parse_tab_width
     @options.parse %w[--tab-width=1]
     assert_equal 1, @options.tab_width

From b1ffd9e959a4afc88e9303a68988783b4759ad17 Mon Sep 17 00:00:00 2001
From: Burdette Lamar <BurdetteLamar@Yahoo.com>
Date: Thu, 17 Oct 2024 15:53:56 -0500
Subject: [PATCH 112/140] [DOC] Tweaks for Array#sort (#11907)

---
 array.c | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/array.c b/array.c
index 42601a5f82ef13..af021af2f6f0c4 100644
--- a/array.c
+++ b/array.c
@@ -3455,21 +3455,18 @@ rb_ary_sort_bang(VALUE ary)
 
 /*
  *  call-seq:
- *    array.sort -> new_array
- *    array.sort {|a, b| ... } -> new_array
+ *    sort -> new_array
+ *    sort {|a, b| ... } -> new_array
  *
- *  Returns a new +Array+ whose elements are those from +self+, sorted.
+ *  Returns a new array containing the elements of +self+, sorted.
  *
- *  With no block, compares elements using operator <tt>#<=></tt>
- *  (see Comparable):
+ *  With no block given, compares elements using operator <tt>#<=></tt>
+ *  (see Object#<=>):
  *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a1 = a.sort
- *    a1 # => ["a", "b", "c", "d", "e"]
+ *    [0, 2, 3, 1].sort # => [0, 1, 2, 3]
  *
- *  With a block, calls the block with each element pair;
- *  for each element pair +a+ and +b+, the block should return an integer:
+ *  With a block given, calls the block with each combination of pairs of elements from +self+;
+ *  for each pair +a+ and +b+, the block should return a numeric:
  *
  *  - Negative when +b+ is to follow +a+.
  *  - Zero when +a+ and +b+ are equivalent.
@@ -3477,22 +3474,14 @@ rb_ary_sort_bang(VALUE ary)
  *
  *  Example:
  *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a1 = a.sort {|a, b| a <=> b }
- *    a1 # => ["a", "b", "c", "d", "e"]
- *    a2 = a.sort {|a, b| b <=> a }
- *    a2 # => ["e", "d", "c", "b", "a"]
+ *    a = [3, 2, 0, 1]
+ *    a.sort {|a, b| a <=> b } # => [0, 1, 2, 3]
+ *    a.sort {|a, b| b <=> a } # => [3, 2, 1, 0]
  *
  *  When the block returns zero, the order for +a+ and +b+ is indeterminate,
- *  and may be unstable:
- *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a1 = a.sort {|a, b| 0 }
- *    a1 # =>  ["c", "e", "b", "d", "a"]
+ *  and may be unstable.
  *
- *  Related: Enumerable#sort_by.
+ *  Related: see {Methods for Fetching}[rdoc-ref:Array@Methods+for+Fetching].
  */
 
 VALUE

From c78e2987d473a44318da024fbcf6cda7647edd70 Mon Sep 17 00:00:00 2001
From: BurdetteLamar <burdettelamar@yahoo.com>
Date: Thu, 17 Oct 2024 10:01:18 -0500
Subject: [PATCH 113/140] [DOC] Tweaks for Array#sort!

---
 array.c | 39 ++++-----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/array.c b/array.c
index af021af2f6f0c4..52e103989baa05 100644
--- a/array.c
+++ b/array.c
@@ -3352,43 +3352,12 @@ sort_2(const void *ap, const void *bp, void *dummy)
 
 /*
  *  call-seq:
- *    array.sort! -> self
- *    array.sort! {|a, b| ... } -> self
+ *    sort! -> self
+ *    sort! {|a, b| ... } -> self
  *
- *  Returns +self+ with its elements sorted in place.
- *
- *  With no block, compares elements using operator <tt>#<=></tt>
- *  (see Comparable):
- *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a.sort!
- *    a # => ["a", "b", "c", "d", "e"]
- *
- *  With a block, calls the block with each element pair;
- *  for each element pair +a+ and +b+, the block should return an integer:
- *
- *  - Negative when +b+ is to follow +a+.
- *  - Zero when +a+ and +b+ are equivalent.
- *  - Positive when +a+ is to follow +b+.
- *
- *  Example:
- *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a.sort! {|a, b| a <=> b }
- *    a # => ["a", "b", "c", "d", "e"]
- *    a.sort! {|a, b| b <=> a }
- *    a # => ["e", "d", "c", "b", "a"]
- *
- *  When the block returns zero, the order for +a+ and +b+ is indeterminate,
- *  and may be unstable:
- *
- *    a = 'abcde'.split('').shuffle
- *    a # => ["e", "b", "d", "a", "c"]
- *    a.sort! {|a, b| 0 }
- *    a # => ["d", "e", "c", "a", "b"]
+ *  Like Array#sort, but returns +self+ with its elements sorted in place.
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 VALUE

From 158b8cb52ec58c8ef8f5241a9db1c6dea4285253 Mon Sep 17 00:00:00 2001
From: Kevin Menard <kevin@nirvdrum.com>
Date: Thu, 17 Oct 2024 17:36:43 -0400
Subject: [PATCH 114/140] YJIT: Add compilation log (#11818)

* YJIT: Add `--yjit-compilation-log` flag to print out the compilation log at exit.

* YJIT: Add an option to enable the compilation log at runtime.

* YJIT: Fix a typo in the `IseqPayload` docs.

* YJIT: Add stubs for getting the YJIT compilation log in memory.

* YJIT: Add a compilation log based on a circular buffer to cap the log size.

* YJIT: Allow specifying either a file or directory name for the YJIT compilation log.

The compilation log will be populated as compilation events occur. If a directory is supplied, then a filename based on the PID will be used as the write target. If a file name is supplied instead, the log will be written to that file.

* YJIT: Add JIT compilation of C function substitutions to the compilation log.

* YJIT: Add compilation events to the circular buffer even if output is sent to a file.

Previously, the two modes were treated as being exclusive of one another. However, it could be beneficial to log all events to a file while also allowing for direct access of the last N events via `RubyVM::YJIT.compilation_log`.

* YJIT: Make timestamps the first element in the YJIT compilation log tuple.

* YJIT: Stream log to stderr if `--yjit-compilation-log` is supplied without an argument.

* YJIT: Eagerly compute compilation log messages to avoid hanging on to references that may GC.

* YJIT: Log all compiled blocks, not just the method entry points.

* YJIT: Remove all compilation events other than block compilation to slim down the log.

* YJIT: Replace circular buffer iterator with a consuming loop.

* YJIT: Support `--yjit-compilation-log=quiet` as a way to activate the in-memory log without printing it.

Co-authored-by: Randy Stauner <randy.stauner@shopify.com>

* YJIT: Promote the compilation log to being the one YJIT log.

Co-authored-by: Randy Stauner <randy.stauner@shopify.com>

* Update doc/yjit/yjit.md

* Update doc/yjit/yjit.md

---------

Co-authored-by: Randy Stauner <randy.stauner@shopify.com>
Co-authored-by: Maxime Chevalier-Boisvert <maximechevalierb@gmail.com>
---
 doc/yjit/yjit.md    |   8 ++
 yjit.c              |   5 +-
 yjit.rb             |  28 ++++++-
 yjit/src/codegen.rs |   3 +
 yjit/src/core.rs    |   2 +-
 yjit/src/cruby.rs   |  20 ++++-
 yjit/src/lib.rs     |   1 +
 yjit/src/log.rs     | 179 ++++++++++++++++++++++++++++++++++++++++++++
 yjit/src/options.rs |  44 +++++++++++
 yjit/src/yjit.rs    |  16 +++-
 10 files changed, 299 insertions(+), 7 deletions(-)
 create mode 100644 yjit/src/log.rs

diff --git a/doc/yjit/yjit.md b/doc/yjit/yjit.md
index d57d5dceda43e5..49e395285f6992 100644
--- a/doc/yjit/yjit.md
+++ b/doc/yjit/yjit.md
@@ -166,6 +166,12 @@ You can dump statistics about compilation and execution by running YJIT with the
 ./miniruby --yjit-stats myscript.rb
 ```
 
+You can see what YJIT has compiled by running YJIT with the `--yjit-log` command-line option:
+
+```sh
+./miniruby --yjit-log myscript.rb
+```
+
 The machine code generated for a given method can be printed by adding `puts RubyVM::YJIT.disasm(method(:method_name))` to a Ruby script. Note that no code will be generated if the method is not compiled.
 
 <h3 id="command-line-options">Command-Line Options</h3>
@@ -181,6 +187,8 @@ YJIT supports all command-line options supported by upstream CRuby, but also add
   compiled, lower values mean less code is compiled (default 200K)
 - `--yjit-stats`: print statistics after the execution of a program (incurs a run-time cost)
 - `--yjit-stats=quiet`: gather statistics while running a program but don't print them. Stats are accessible through `RubyVM::YJIT.runtime_stats`. (incurs a run-time cost)
+- `--yjit-log[=file|dir]`: log all compilation events to the specified file or directory. If no name is supplied, the last 1024 log entries will be printed to stderr when the application exits.
+- `--yjit-log=quiet`: gather a circular buffer of recent YJIT compilations. The compilation log entries are accessible through `RubyVM::YJIT.log` and old entries will be discarded if the buffer is not drained quickly. (incurs a run-time cost)
 - `--yjit-disable`: disable YJIT despite other `--yjit*` flags for lazily enabling it with `RubyVM::YJIT.enable`
 - `--yjit-code-gc`: enable code GC (disabled by default as of Ruby 3.3).
   It will cause all machine code to be discarded when the executable memory size limit is hit, meaning JIT compilation will then start over.
diff --git a/yjit.c b/yjit.c
index 93d8fe5c9f18be..737372daa14b20 100644
--- a/yjit.c
+++ b/yjit.c
@@ -1226,15 +1226,18 @@ rb_yjit_set_exception_return(rb_control_frame_t *cfp, void *leave_exit, void *le
 // Primitives used by yjit.rb
 VALUE rb_yjit_stats_enabled_p(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_print_stats_p(rb_execution_context_t *ec, VALUE self);
+VALUE rb_yjit_log_enabled_p(rb_execution_context_t *c, VALUE self);
+VALUE rb_yjit_print_log_p(rb_execution_context_t *c, VALUE self);
 VALUE rb_yjit_trace_exit_locations_enabled_p(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_get_stats(rb_execution_context_t *ec, VALUE self, VALUE key);
 VALUE rb_yjit_reset_stats_bang(rb_execution_context_t *ec, VALUE self);
+VALUE rb_yjit_get_log(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_disasm_iseq(rb_execution_context_t *ec, VALUE self, VALUE iseq);
 VALUE rb_yjit_insns_compiled(rb_execution_context_t *ec, VALUE self, VALUE iseq);
 VALUE rb_yjit_code_gc(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_simulate_oom_bang(rb_execution_context_t *ec, VALUE self);
 VALUE rb_yjit_get_exit_locations(rb_execution_context_t *ec, VALUE self);
-VALUE rb_yjit_enable(rb_execution_context_t *ec, VALUE self, VALUE gen_stats, VALUE print_stats);
+VALUE rb_yjit_enable(rb_execution_context_t *ec, VALUE self, VALUE gen_stats, VALUE print_stats, VALUE gen_compilation_log, VALUE print_compilation_log);
 
 // Preprocessed yjit.rb generated during build
 #include "yjit.rbinc"
diff --git a/yjit.rb b/yjit.rb
index 5483e39bf3e7cf..bcd34cde9bb177 100644
--- a/yjit.rb
+++ b/yjit.rb
@@ -18,6 +18,11 @@ def self.stats_enabled?
     Primitive.rb_yjit_stats_enabled_p
   end
 
+  # Check if `--yjit-log` is used.
+  def self.log_enabled?
+    Primitive.rb_yjit_log_enabled_p
+  end
+
   # Check if rb_yjit_trace_exit_locations_enabled_p is enabled.
   def self.trace_exit_locations_enabled? # :nodoc:
     Primitive.rb_yjit_trace_exit_locations_enabled_p
@@ -28,15 +33,22 @@ def self.reset_stats!
     Primitive.rb_yjit_reset_stats_bang
   end
 
-  # Enable \YJIT compilation. `stats` option decides whether to enable \YJIT stats or not.
+  # Enable \YJIT compilation. `stats` option decides whether to enable \YJIT stats or not. `compilation_log` decides
+  # whether to enable \YJIT compilation logging or not.
   #
+  # `stats`:
   # * `false`: Disable stats.
   # * `true`: Enable stats. Print stats at exit.
   # * `:quiet`: Enable stats. Do not print stats at exit.
-  def self.enable(stats: false)
+  #
+  # `log`:
+  # * `false`: Don't enable the log.
+  # * `true`: Enable the log. Print log at exit.
+  # * `:quiet`: Enable the log. Do not print log at exit.
+  def self.enable(stats: false, log: false)
     return false if enabled?
     at_exit { print_and_dump_stats } if stats
-    Primitive.rb_yjit_enable(stats, stats != :quiet)
+    Primitive.rb_yjit_enable(stats, stats != :quiet, log, log != :quiet)
   end
 
   # If --yjit-trace-exits is enabled parse the hashes from
@@ -173,6 +185,16 @@ def self.stats_string
     strio.string
   end
 
+  # Return an array of log entries.
+  # Return `nil` when option is not passed or unavailable.
+  def self.log
+    return nil unless log_enabled?
+
+    Primitive.rb_yjit_get_log.map do |timestamp, path|
+      [Time.at(timestamp), path]
+    end
+  end
+
   # Produce disassembly for an iseq. This requires a `--enable-yjit=dev` build.
   def self.disasm(iseq) # :nodoc:
     # If a method or proc is passed in, get its iseq
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index 7e69ba32facbe8..82ec10b0740e99 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -458,6 +458,7 @@ macro_rules! perf_call {
 }
 
 use crate::codegen::JCCKinds::*;
+use crate::log::Log;
 
 #[allow(non_camel_case_types, unused)]
 pub enum JCCKinds {
@@ -1223,6 +1224,8 @@ pub fn gen_single_block(
         asm_comment!(asm, "reg_mapping: {:?}", asm.ctx.get_reg_mapping());
     }
 
+    Log::add_block_with_chain_depth(blockid, asm.ctx.get_chain_depth());
+
     // Mark the start of an ISEQ for --yjit-perf
     jit_perf_symbol_push!(jit, &mut asm, &get_iseq_name(iseq), PerfMap::ISEQ);
 
diff --git a/yjit/src/core.rs b/yjit/src/core.rs
index 32bce76a015219..ef91638ca68ab6 100644
--- a/yjit/src/core.rs
+++ b/yjit/src/core.rs
@@ -1763,7 +1763,7 @@ pub struct IseqPayload {
     // Basic block versions
     pub version_map: VersionMap,
 
-    // Indexes of code pages used by this this ISEQ
+    // Indexes of code pages used by this ISEQ
     pub pages: HashSet<usize>,
 
     // List of ISEQ entry codes
diff --git a/yjit/src/cruby.rs b/yjit/src/cruby.rs
index 702aaf51bc4e7c..25fabec1d0b370 100644
--- a/yjit/src/cruby.rs
+++ b/yjit/src/cruby.rs
@@ -84,6 +84,7 @@
 
 use std::convert::From;
 use std::ffi::{CString, CStr};
+use std::fmt::{Debug, Formatter};
 use std::os::raw::{c_char, c_int, c_uint};
 use std::panic::{catch_unwind, UnwindSafe};
 
@@ -563,6 +564,18 @@ impl From<*const rb_callable_method_entry_t> for VALUE {
     }
 }
 
+impl From<&str> for VALUE {
+    fn from(value: &str) -> Self {
+        rust_str_to_ruby(value)
+    }
+}
+
+impl From<String> for VALUE {
+    fn from(value: String) -> Self {
+        rust_str_to_ruby(&value)
+    }
+}
+
 impl From<VALUE> for u64 {
     fn from(value: VALUE) -> Self {
         let VALUE(uimm) = value;
@@ -594,7 +607,6 @@ impl From<VALUE> for u16 {
 }
 
 /// Produce a Ruby string from a Rust string slice
-#[cfg(feature = "disasm")]
 pub fn rust_str_to_ruby(str: &str) -> VALUE {
     unsafe { rb_utf8_str_new(str.as_ptr() as *const _, str.len() as i64) }
 }
@@ -625,6 +637,12 @@ pub struct SourceLocation {
     pub line: c_int,
 }
 
+impl Debug for SourceLocation {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!("{}:{}", self.file.to_string_lossy(), self.line))
+    }
+}
+
 /// Make a [SourceLocation] at the current spot.
 macro_rules! src_loc {
     () => {
diff --git a/yjit/src/lib.rs b/yjit/src/lib.rs
index 3f3d24be4b4c2a..1e3f31b88ba22f 100644
--- a/yjit/src/lib.rs
+++ b/yjit/src/lib.rs
@@ -15,3 +15,4 @@ mod stats;
 mod utils;
 mod yjit;
 mod virtualmem;
+mod log;
diff --git a/yjit/src/log.rs b/yjit/src/log.rs
new file mode 100644
index 00000000000000..f2dcf519e08692
--- /dev/null
+++ b/yjit/src/log.rs
@@ -0,0 +1,179 @@
+use crate::core::BlockId;
+use crate::cruby::*;
+use crate::options::*;
+use crate::yjit::yjit_enabled_p;
+
+use std::fmt::{Display, Formatter};
+use std::os::raw::c_long;
+use crate::utils::iseq_get_location;
+
+type Timestamp = f64;
+
+#[derive(Clone, Debug)]
+pub struct LogEntry {
+    /// The time when the block was compiled.
+    pub timestamp: Timestamp,
+
+    /// The log message.
+    pub message: String,
+}
+
+impl Display for LogEntry {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{:15.6}: {}", self.timestamp, self.message)
+    }
+}
+
+pub type Log = CircularBuffer<LogEntry, 1024>;
+static mut LOG: Option<Log> = None;
+
+impl Log {
+    pub fn init() {
+        unsafe {
+            LOG = Some(Log::new());
+        }
+    }
+
+    pub fn get_instance() -> &'static mut Log {
+        unsafe {
+            LOG.as_mut().unwrap()
+        }
+    }
+
+    pub fn has_instance() -> bool {
+        unsafe {
+            LOG.as_mut().is_some()
+        }
+    }
+
+    pub fn add_block_with_chain_depth(block_id: BlockId, chain_depth: u8) {
+        if !Self::has_instance() {
+            return;
+        }
+
+        let print_log = get_option!(log);
+        let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs_f64();
+
+        let location = iseq_get_location(block_id.iseq, block_id.idx);
+        let index = block_id.idx;
+        let message = if chain_depth > 0 {
+            format!("{} (index: {}, chain_depth: {})", location, index, chain_depth)
+        } else {
+            format!("{} (index: {})", location, index)
+        };
+
+        let entry = LogEntry {
+            timestamp,
+            message
+        };
+
+        if let Some(output) = print_log {
+            match output {
+                LogOutput::Stderr => {
+                    eprintln!("{}", entry);
+                }
+
+                LogOutput::File(fd) => {
+                    use std::os::unix::io::{FromRawFd, IntoRawFd};
+                    use std::io::Write;
+
+                    // Write with the fd opened during boot
+                    let mut file = unsafe { std::fs::File::from_raw_fd(fd) };
+                    writeln!(file, "{}", entry).unwrap();
+                    file.flush().unwrap();
+                    file.into_raw_fd(); // keep the fd open
+                }
+
+                LogOutput::MemoryOnly => () // Don't print or write anything
+            }
+        }
+
+        Self::get_instance().push(entry);
+    }
+}
+
+pub struct CircularBuffer<T, const N: usize> {
+    buffer: Vec<Option<T>>,
+    head: usize,
+    tail: usize,
+    size: usize
+}
+
+impl<T: Clone, const N: usize> CircularBuffer<T, N> {
+    pub fn new() -> Self {
+        Self {
+            buffer: vec![None; N],
+            head: 0,
+            tail: 0,
+            size: 0
+        }
+    }
+
+    pub fn push(&mut self, value: T) {
+        self.buffer[self.head] = Some(value);
+        self.head = (self.head + 1) % N;
+        if self.size == N {
+            self.tail = (self.tail + 1) % N;
+        } else {
+            self.size += 1;
+        }
+    }
+
+    pub fn pop(&mut self) -> Option<T> {
+        if self.size == 0 {
+            return None;
+        }
+
+        let value = self.buffer[self.tail].take();
+        self.tail = (self.tail + 1) % N;
+        self.size -= 1;
+        value
+    }
+
+    pub fn len(&self) -> usize {
+        self.size
+    }
+}
+
+
+//===========================================================================
+
+/// Primitive called in yjit.rb
+/// Check if log generation is enabled
+#[no_mangle]
+pub extern "C" fn rb_yjit_log_enabled_p(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
+    if get_option!(log).is_some() {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+/// Primitive called in yjit.rb.
+/// Export all YJIT log entries as a Ruby array.
+#[no_mangle]
+pub extern "C" fn rb_yjit_get_log(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
+    with_vm_lock(src_loc!(), || rb_yjit_get_log_array())
+}
+
+fn rb_yjit_get_log_array() -> VALUE {
+    if !yjit_enabled_p() || get_option!(log).is_none() {
+        return Qnil;
+    }
+
+    let log = Log::get_instance();
+    let array = unsafe { rb_ary_new_capa(log.len() as c_long) };
+
+    while log.len() > 0 {
+        let entry = log.pop().unwrap();
+
+        unsafe {
+            let entry_array = rb_ary_new_capa(2);
+            rb_ary_push(entry_array, rb_float_new(entry.timestamp));
+            rb_ary_push(entry_array, entry.message.into());
+            rb_ary_push(array, entry_array);
+        }
+    }
+
+    return array;
+}
diff --git a/yjit/src/options.rs b/yjit/src/options.rs
index c91c36573890fa..b993b5685bf213 100644
--- a/yjit/src/options.rs
+++ b/yjit/src/options.rs
@@ -82,6 +82,9 @@ pub struct Options {
 
     /// Enable writing /tmp/perf-{pid}.map for Linux perf
     pub perf_map: Option<PerfMap>,
+
+    // Where to store the log. `None` disables the log.
+    pub log: Option<LogOutput>,
 }
 
 // Initialize the options to default values
@@ -103,6 +106,7 @@ pub static mut OPTIONS: Options = Options {
     frame_pointer: false,
     code_gc: false,
     perf_map: None,
+    log: None,
 };
 
 /// YJIT option descriptions for `ruby --help`.
@@ -113,6 +117,7 @@ pub const YJIT_OPTIONS: &'static [(&str, &str)] = &[
     ("--yjit-call-threshold=num",          "Number of calls to trigger JIT."),
     ("--yjit-cold-threshold=num",          "Global calls after which ISEQs not compiled (default: 200K)."),
     ("--yjit-stats",                       "Enable collecting YJIT statistics."),
+    ("--yjit--log[=file|dir]",             "Enable logging of YJIT's compilation activity."),
     ("--yjit-disable",                     "Disable YJIT for lazily enabling it with RubyVM::YJIT.enable."),
     ("--yjit-code-gc",                     "Run code GC when the code size reaches the limit."),
     ("--yjit-perf",                        "Enable frame pointers and perf profiling."),
@@ -128,6 +133,16 @@ pub enum TraceExits {
     Counter(Counter),
 }
 
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum LogOutput {
+    // Dump to the log file as events occur.
+    File(std::os::unix::io::RawFd),
+    // Keep the log in memory only
+    MemoryOnly,
+    // Dump to stderr when the process exits
+    Stderr
+}
+
 #[derive(Debug)]
 pub enum DumpDisasm {
     // Dump to stdout
@@ -170,6 +185,7 @@ macro_rules! get_option_ref {
     };
 }
 pub(crate) use get_option_ref;
+use crate::log::Log;
 
 /// Expected to receive what comes after the third dash in "--yjit-*".
 /// Empty string means user passed only "--yjit". C code rejects when
@@ -310,6 +326,34 @@ pub fn parse_option(str_ptr: *const std::os::raw::c_char) -> Option<()> {
                 return None;
             }
         },
+        ("log", _) => match opt_val {
+            "" => unsafe {
+                OPTIONS.log = Some(LogOutput::Stderr);
+                Log::init();
+            },
+            "quiet" => unsafe {
+                OPTIONS.log = Some(LogOutput::MemoryOnly);
+                Log::init();
+            },
+            arg_value => {
+                let log_file_path = if std::path::Path::new(arg_value).is_dir() {
+                    format!("{arg_value}/yjit_{}.log", std::process::id())
+                } else {
+                    arg_value.to_string()
+                };
+
+                match File::options().create(true).write(true).truncate(true).open(&log_file_path) {
+                    Ok(file) => {
+                        use std::os::unix::io::IntoRawFd;
+                        eprintln!("YJIT log: {log_file_path}");
+
+                        unsafe { OPTIONS.log = Some(LogOutput::File(file.into_raw_fd())) }
+                        Log::init()
+                    }
+                    Err(err) => panic!("Failed to create {log_file_path}: {err}"),
+                }
+            }
+        },
         ("trace-exits", _) => unsafe {
             OPTIONS.gen_stats = true;
             OPTIONS.trace_exits = match opt_val {
diff --git a/yjit/src/yjit.rs b/yjit/src/yjit.rs
index c2647d55f77b5a..a9ecc24a80b424 100644
--- a/yjit/src/yjit.rs
+++ b/yjit/src/yjit.rs
@@ -8,6 +8,7 @@ use crate::stats::incr_counter;
 use crate::stats::with_compile_time;
 
 use std::os::raw;
+use crate::log::Log;
 
 /// Is YJIT on? The interpreter uses this variable to decide whether to trigger
 /// compilation. See jit_exec() and jit_compile().
@@ -167,7 +168,7 @@ pub extern "C" fn rb_yjit_code_gc(_ec: EcPtr, _ruby_self: VALUE) -> VALUE {
 
 /// Enable YJIT compilation, returning true if YJIT was previously disabled
 #[no_mangle]
-pub extern "C" fn rb_yjit_enable(_ec: EcPtr, _ruby_self: VALUE, gen_stats: VALUE, print_stats: VALUE) -> VALUE {
+pub extern "C" fn rb_yjit_enable(_ec: EcPtr, _ruby_self: VALUE, gen_stats: VALUE, print_stats: VALUE, gen_log: VALUE, print_log: VALUE) -> VALUE {
     with_vm_lock(src_loc!(), || {
         // Initialize and enable YJIT
         if gen_stats.test() {
@@ -176,6 +177,19 @@ pub extern "C" fn rb_yjit_enable(_ec: EcPtr, _ruby_self: VALUE, gen_stats: VALUE
                 OPTIONS.print_stats = print_stats.test();
             }
         }
+
+        if gen_log.test() {
+            unsafe {
+                if print_log.test() {
+                    OPTIONS.log = Some(LogOutput::Stderr);
+                } else {
+                    OPTIONS.log = Some(LogOutput::MemoryOnly);
+                }
+
+                Log::init();
+            }
+        }
+
         yjit_init();
 
         // Add "+YJIT" to RUBY_DESCRIPTION

From cb39283cbfcfeb920fff66d3ef77e4ed7f2f8d93 Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:08:34 -0400
Subject: [PATCH 115/140] YJIT: In stats, group by resolved C method name

Previously, in the "Top-N most frequent C calls"
section of --yjit-stats output, we printed the class
name of the receiver, not the method owner. This meant
that calls on subclass instances that land on the same
method showed up as different entires.

Similarly, method called using an alias showed up as
different entries from other aliases.

Group by the resolved method instead.

Test program:

    1.itself; [].itself; true.inspect; true.to_s

Before:

    Top-4 most frequent C calls (80.0% of C calls):
      1 (20.0%): Integer#itself
      1 (20.0%): TrueClass#to_s
      1 (20.0%): TrueClass#inspect
      1 (20.0%): Array#itself

After:

    Top-2 most frequent C calls (80.0% of C calls):
      2 (40.0%): Kernel#itself
      2 (40.0%): TrueClass#to_s
---
 yjit/src/codegen.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index 82ec10b0740e99..86f39414a995df 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -6871,8 +6871,8 @@ fn gen_send_cfunc(
     // We also do this after the C call to minimize the impact of spill_temps() on asm.ccall().
     if get_option!(gen_stats) {
         // Assemble the method name string
-        let mid = unsafe { vm_ci_mid(ci) };
-        let name_str = get_method_name(recv_known_class, mid);
+        let mid = unsafe { rb_get_def_original_id((*cme).def) };
+        let name_str = get_method_name(Some(unsafe { (*cme).owner }), mid);
 
         // Get an index for this cfunc name
         let cfunc_idx = get_cfunc_idx(&name_str);
@@ -9099,7 +9099,10 @@ fn gen_send_general(
 
 /// Get class name from a class pointer.
 fn get_class_name(class: Option<VALUE>) -> String {
-    class.and_then(|class| unsafe {
+    class.filter(|&class| {
+        // type checks for rb_class2name()
+        unsafe { RB_TYPE_P(class, RUBY_T_MODULE) || RB_TYPE_P(class, RUBY_T_CLASS) }
+    }).and_then(|class| unsafe {
         cstr_to_rust_string(rb_class2name(class))
     }).unwrap_or_else(|| "Unknown".to_string())
 }

From e67137fe289cd84df41bf26e08588812715957e4 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Thu, 17 Oct 2024 21:53:36 +0200
Subject: [PATCH 116/140] [ruby/syntax_suggest] A gem executable should not use
 require_relative

Otherwise it makes incorrect assumption about RubyGems layout.

https://github.com/ruby/syntax_suggest/commit/04585d820d
---
 libexec/syntax_suggest | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libexec/syntax_suggest b/libexec/syntax_suggest
index a54c690d2b2a8b..3dc8eb94d120f1 100755
--- a/libexec/syntax_suggest
+++ b/libexec/syntax_suggest
@@ -1,11 +1,6 @@
 #!/usr/bin/env ruby
 
-begin
-  require_relative "../lib/syntax_suggest/api"
-rescue LoadError
-  # for default gems
-  require "syntax_suggest/api"
-end
+require "syntax_suggest/api"
 
 SyntaxSuggest::Cli.new(
   argv: ARGV

From 4b21fb125fdd8de7c9c4fef9fab917a0886bea60 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 18 Oct 2024 10:39:46 +0900
Subject: [PATCH 117/140] [ruby/syntax_suggest] Removed empty comment

https://github.com/ruby/syntax_suggest/commit/e1d9c83736
---
 lib/syntax_suggest/lex_value.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/syntax_suggest/lex_value.rb b/lib/syntax_suggest/lex_value.rb
index 008cc105b5398c..b46a332772742c 100644
--- a/lib/syntax_suggest/lex_value.rb
+++ b/lib/syntax_suggest/lex_value.rb
@@ -28,7 +28,7 @@ def initialize(line, type, token, state, last_lex = nil)
       @is_end = false
       @is_kw = false
       return if type != :on_kw
-      #
+
       return if last_lex && last_lex.fname? # https://github.com/ruby/ruby/commit/776759e300e4659bb7468e2b97c8c2d4359a2953
 
       case token

From 8b4df90a24a886ed2ccb4b381d43a5f3b47d21bc Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 18 Oct 2024 11:04:38 +0900
Subject: [PATCH 118/140] [ruby/syntax_suggest] Bump up 2.0.1

https://github.com/ruby/syntax_suggest/commit/0b9e4081c0
---
 lib/syntax_suggest/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/syntax_suggest/version.rb b/lib/syntax_suggest/version.rb
index 4320adb218b8a7..d5eff2a17a5e5a 100644
--- a/lib/syntax_suggest/version.rb
+++ b/lib/syntax_suggest/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SyntaxSuggest
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

From 5152f81fffca7a5f65ed874603a9761771721029 Mon Sep 17 00:00:00 2001
From: git <svn-admin@ruby-lang.org>
Date: Fri, 18 Oct 2024 02:07:47 +0000
Subject: [PATCH 119/140] Update default gems list at
 8b4df90a24a886ed2ccb4b381d43a5 [ci skip]

---
 NEWS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS.md b/NEWS.md
index 7e05a8e7d0efdc..0ae8c4cb76b000 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -94,6 +94,7 @@ The following default gems are updated.
 * resolv 0.4.0
 * stringio 3.1.2.dev
 * strscan 3.1.1.dev
+* syntax_suggest 2.0.1
 * time 0.4.0
 * uri 0.13.1
 * zlib 3.1.1

From c4d4c6b84683f0b5f9a84f29060a40823f3f5fe2 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 19:36:48 +0200
Subject: [PATCH 120/140] [ruby/json] Speedup Parser initialization

Extracted from: https://github.com/ruby/json/pull/512

Use `rb_hash_lookup2` to check for hash key existence instead
of going through `rb_funcall`.

https://github.com/ruby/json/commit/43835a0d13

Co-Authored-By: lukeg <luke.gru@gmail.com>
---
 ext/json/parser/parser.c  | 3 +--
 ext/json/parser/parser.h  | 2 +-
 ext/json/parser/parser.rl | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index a1947314f81923..335b2a20ba5ec9 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -74,7 +74,7 @@ static VALUE CNaN, CInfinity, CMinusInfinity;
 
 static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
           i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
-          i_object_class, i_array_class, i_decimal_class, i_key_p,
+          i_object_class, i_array_class, i_decimal_class,
           i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
           i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
 
@@ -2180,7 +2180,6 @@ void Init_parser(void)
     i_decimal_class = rb_intern("decimal_class");
     i_match = rb_intern("match");
     i_match_string = rb_intern("match_string");
-    i_key_p = rb_intern("key?");
     i_deep_const_get = rb_intern("deep_const_get");
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index e11bddf7c2c050..9c7f0e7d21c32b 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -7,7 +7,7 @@
 # define MAYBE_UNUSED(x) x
 #endif
 
-#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
+#define option_given_p(opts, key) (rb_hash_lookup2(opts, key, Qundef) != Qundef)
 
 typedef struct JSON_ParserStruct {
     VALUE Vsource;
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index 7425204615bec0..e3b3f325e6cd92 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -72,7 +72,7 @@ static VALUE CNaN, CInfinity, CMinusInfinity;
 
 static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
           i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
-          i_object_class, i_array_class, i_decimal_class, i_key_p,
+          i_object_class, i_array_class, i_decimal_class,
           i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
           i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
 
@@ -943,7 +943,6 @@ void Init_parser(void)
     i_decimal_class = rb_intern("decimal_class");
     i_match = rb_intern("match");
     i_match_string = rb_intern("match_string");
-    i_key_p = rb_intern("key?");
     i_deep_const_get = rb_intern("deep_const_get");
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");

From 57e1b64c812210f7bd703bc5d8d459d7a1197629 Mon Sep 17 00:00:00 2001
From: YuheiNakasaka <yuhei.nakasaka@gmail.com>
Date: Fri, 3 Jun 2022 11:07:06 +0900
Subject: [PATCH 121/140] [ruby/json] Fix behavior of trying to parse
 non-string objects

https://github.com/ruby/json/commit/e2e9936047
---
 ext/json/lib/json/common.rb             | 26 +++++++++++++++++--------
 test/json/json_common_interface_test.rb | 22 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 840c630fd5ed6e..403bd34b1dea45 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -20,11 +20,16 @@ class << self
     #   ruby = [0, 1, nil]
     #   JSON[ruby] # => '[0,1,null]'
     def [](object, opts = {})
-      if object.respond_to? :to_str
-        JSON.parse(object.to_str, opts)
-      else
-        JSON.generate(object, opts)
+      if object.is_a?(String)
+        return JSON.parse(object, opts)
+      elsif object.respond_to?(:to_str)
+        str = object.to_str
+        if str.is_a?(String)
+          return JSON.parse(object.to_str, opts)
+        end
       end
+
+      JSON.generate(object, opts)
     end
 
     # Returns the JSON parser class that is used by JSON. This is either
@@ -693,11 +698,16 @@ def jj(*objs)
   # The _opts_ argument is passed through to generate/parse respectively. See
   # generate and parse for their documentation.
   def JSON(object, *args)
-    if object.respond_to? :to_str
-      JSON.parse(object.to_str, args.first)
-    else
-      JSON.generate(object, args.first)
+    if object.is_a?(String)
+      return JSON.parse(object, args.first)
+    elsif object.respond_to?(:to_str)
+      str = object.to_str
+      if str.is_a?(String)
+        return JSON.parse(object.to_str, args.first)
+      end
     end
+
+    JSON.generate(object, args.first)
   end
 end
 
diff --git a/test/json/json_common_interface_test.rb b/test/json/json_common_interface_test.rb
index c16f6ceaaf97d2..f604d402f00fb2 100644
--- a/test/json/json_common_interface_test.rb
+++ b/test/json/json_common_interface_test.rb
@@ -6,6 +6,13 @@
 class JSONCommonInterfaceTest < Test::Unit::TestCase
   include JSON
 
+  module MethodMissing
+    def method_missing(name, *args); end
+    def respond_to_missing?(name, include_private)
+      true
+    end
+  end
+
   def setup
     @hash = {
       'a' => 2,
@@ -17,12 +24,26 @@ def setup
       'h' => 1000.0,
       'i' => 0.001
     }
+
+    @hash_with_method_missing = {
+      'a' => 2,
+      'b' => 3.141,
+      'c' => 'c',
+      'd' => [ 1, "b", 3.14 ],
+      'e' => { 'foo' => 'bar' },
+      'g' => "\"\0\037",
+      'h' => 1000.0,
+      'i' => 0.001
+    }
+    @hash_with_method_missing.extend MethodMissing
+
     @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
   end
 
   def test_index
     assert_equal @json, JSON[@hash]
+    assert_equal @json, JSON[@hash_with_method_missing]
     assert_equal @hash, JSON[@json]
   end
 
@@ -129,6 +150,7 @@ def test_dump_should_modify_defaults
 
   def test_JSON
     assert_equal @json, JSON(@hash)
+    assert_equal @json, JSON(@hash_with_method_missing)
     assert_equal @hash, JSON(@json)
   end
 

From 20dc1e5c255da87afb3829fa015142f23ee56b57 Mon Sep 17 00:00:00 2001
From: Takumasa Ochi <aeroastro007@gmail.com>
Date: Mon, 14 Aug 2023 21:56:44 +0900
Subject: [PATCH 122/140] [ruby/json] Always dup argument to preserve original
 encoding for force_encoding

https://github.com/ruby/json/commit/db9a489ca2
---
 ext/json/parser/parser.rl     | 5 +----
 test/json/json_parser_test.rb | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index e3b3f325e6cd92..61674b7812dfe9 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -673,10 +673,7 @@ static VALUE convert_encoding(VALUE source)
   }
 
  if (encindex == binary_encindex) {
-    if (OBJ_FROZEN(source)) {
-      source = rb_str_dup(source);
-    }
-    return rb_enc_associate_index(source, utf8_encindex);
+    return rb_enc_associate_index(rb_str_dup(source), utf8_encindex);
   }
 
   return rb_str_conv_enc(source, rb_enc_from_index(encindex), rb_utf8_encoding());
diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index 610ea06f3f88d1..d76281e6bc267f 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -26,6 +26,12 @@ def test_argument_encoding
     assert_equal Encoding::UTF_16, source.encoding
   end if defined?(Encoding::UTF_16)
 
+  def test_argument_encoding_for_binary
+    source = "{}".encode("ASCII-8BIT")
+    JSON::Parser.new(source)
+    assert_equal Encoding::ASCII_8BIT, source.encoding
+  end if defined?(Encoding::ASCII_8BIT)
+
   def test_error_message_encoding
     pend if RUBY_ENGINE == 'truffleruby'
 

From 8feed977a06aba59d16af48a409ea0b802468c8a Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 17 Oct 2024 19:12:58 +0200
Subject: [PATCH 123/140] [ruby/json] Assume Encoding is defined

https://github.com/ruby/json/commit/8713aa4812
---
 test/json/json_generator_test.rb | 6 ++----
 test/json/json_parser_test.rb    | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
index 2436fa0627d841..d14966f8d0ef3b 100755
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -479,9 +479,7 @@ def test_string_ext_included_calls_super
     end
   end
 
-  if defined?(Encoding)
-    def test_nonutf8_encoding
-      assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
-    end
+  def test_nonutf8_encoding
+    assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
   end
 end
diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index d76281e6bc267f..27cc0f5d45ad5d 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -24,13 +24,13 @@ def test_argument_encoding
     source = "{}".encode("UTF-16")
     JSON::Parser.new(source)
     assert_equal Encoding::UTF_16, source.encoding
-  end if defined?(Encoding::UTF_16)
+  end
 
   def test_argument_encoding_for_binary
     source = "{}".encode("ASCII-8BIT")
     JSON::Parser.new(source)
     assert_equal Encoding::ASCII_8BIT, source.encoding
-  end if defined?(Encoding::ASCII_8BIT)
+  end
 
   def test_error_message_encoding
     pend if RUBY_ENGINE == 'truffleruby'
@@ -42,7 +42,7 @@ def test_error_message_encoding
     }
     assert_equal(Encoding::UTF_8, e.message.encoding, bug10705)
     assert_include(e.message, json, bug10705)
-  end if defined?(Encoding::UTF_8) and defined?(JSON::Ext::Parser)
+  end if defined?(JSON::Ext::Parser)
 
   def test_parsing
     parser = JSON::Parser.new('"test"')

From 326a21d4417078756f0f24a6f1949293fc737626 Mon Sep 17 00:00:00 2001
From: Stephen Humphries <stephen.humphries@shopify.com>
Date: Thu, 10 Feb 2022 14:47:42 -0500
Subject: [PATCH 124/140] Relax Pure::Parser's comment regex...

...to allow any character sequence, including "/*", before then end
sequence of a multi-line ANSI C-style comment
.
---
 test/json/json_parser_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index 27cc0f5d45ad5d..d353272e539214 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -272,6 +272,14 @@ def test_parse_comments
 EOT
     assert_raise(ParserError) { parse(json) }
     json = <<EOT
+{
+  "key1":"value1"  /* multi line
+                    // nested eol comment
+                    /* legal nested multi line comment start sequence */
+}
+EOT
+    assert_equal({ "key1" => "value1" }, parse(json))
+    json = <<EOT
 {
   "key1":"value1"  /* multi line
                    // nested eol comment

From 9a98b70a50c9d8e73c0194646093d6a15a223e3f Mon Sep 17 00:00:00 2001
From: kojix2 <2xijok@gmail.com>
Date: Fri, 18 Oct 2024 04:52:27 +0900
Subject: [PATCH 125/140] [ruby/fiddle] test: Fix a typo
 (https://github.com/ruby/fiddle/pull/154)

https://github.com/ruby/fiddle/commit/1f818e4684
---
 test/fiddle/test_import.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
index 79b65d97f52386..a6a3b66655d609 100644
--- a/test/fiddle/test_import.rb
+++ b/test/fiddle/test_import.rb
@@ -215,7 +215,7 @@ def test_nested_struct_reusing_other_structs()
 
       keyboard_event_struct = Fiddle::Importer.struct(['unsigned int state', 'char key'])
       mouse_event_struct    = Fiddle::Importer.struct(['unsigned int button', 'unsigned short x', 'unsigned short y'])
-      event_union           = Fiddle::Importer.union([{ keboard: keyboard_event_struct, mouse: mouse_event_struct}])
+      event_union           = Fiddle::Importer.union([{ keyboard: keyboard_event_struct, mouse: mouse_event_struct}])
       assert_equal LIBC::UnionNestedStruct.size, event_union.size
     end
 

From 3ddaf24cd2ce41a5a840acf8335d735eef966920 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Wed, 16 Oct 2024 09:20:32 -0400
Subject: [PATCH 126/140] Move object processing in Process.warmup to gc.c

---
 gc.c         | 14 ++++++++++++++
 gc/default.c |  6 +-----
 gc/gc.h      |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gc.c b/gc.c
index c2889a78c25f8f..dc17f3bf318f79 100644
--- a/gc.c
+++ b/gc.c
@@ -3007,6 +3007,20 @@ rb_gc_location(VALUE value)
     return rb_gc_impl_location(rb_gc_get_objspace(), value);
 }
 
+void
+rb_gc_prepare_heap_process_object(VALUE obj)
+{
+    switch (BUILTIN_TYPE(obj)) {
+      case T_STRING:
+        // Precompute the string coderange. This both save time for when it will be
+        // eventually needed, and avoid mutating heap pages after a potential fork.
+        rb_enc_str_coderange(obj);
+        break;
+      default:
+        break;
+    }
+}
+
 void
 rb_gc_prepare_heap(void)
 {
diff --git a/gc/default.c b/gc/default.c
index d28c8aa5537888..dac7aaeed63ff5 100644
--- a/gc/default.c
+++ b/gc/default.c
@@ -6763,12 +6763,8 @@ gc_set_candidate_object_i(void *vstart, void *vend, size_t stride, void *data)
               case T_NONE:
               case T_ZOMBIE:
                 break;
-              case T_STRING:
-                // precompute the string coderange. This both save time for when it will be
-                // eventually needed, and avoid mutating heap pages after a potential fork.
-                rb_enc_str_coderange(v);
-                // fall through
               default:
+                rb_gc_prepare_heap_process_object(v);
                 if (!RVALUE_OLD_P(objspace, v) && !RVALUE_WB_UNPROTECTED(objspace, v)) {
                     RVALUE_AGE_SET_CANDIDATE(objspace, v);
                 }
diff --git a/gc/gc.h b/gc/gc.h
index d5b07faf9270d9..1cacf8a2a58d32 100644
--- a/gc/gc.h
+++ b/gc/gc.h
@@ -42,6 +42,7 @@ uint32_t rb_gc_get_shape(VALUE obj);
 void rb_gc_set_shape(VALUE obj, uint32_t shape_id);
 uint32_t rb_gc_rebuild_shape(VALUE obj, size_t heap_id);
 size_t rb_obj_memsize_of(VALUE obj);
+void rb_gc_prepare_heap_process_object(VALUE obj);
 RUBY_SYMBOL_EXPORT_END
 
 void rb_ractor_finish_marking(void);

From 6b1268c7bf0816a250991593f1e504db428b6e30 Mon Sep 17 00:00:00 2001
From: Jerome Dalbert <jerome.dalbert@gmail.com>
Date: Wed, 16 Oct 2024 19:17:55 -0700
Subject: [PATCH 127/140] [rubygems/rubygems] Clarify `bundle install --quiet`
 documentation

Bundler always exits with a status code.

https://github.com/rubygems/rubygems/commit/3a38bd0b12
---
 lib/bundler/man/bundle-add.1          | 2 +-
 lib/bundler/man/bundle-binstubs.1     | 2 +-
 lib/bundler/man/bundle-cache.1        | 2 +-
 lib/bundler/man/bundle-check.1        | 2 +-
 lib/bundler/man/bundle-clean.1        | 2 +-
 lib/bundler/man/bundle-config.1       | 2 +-
 lib/bundler/man/bundle-console.1      | 2 +-
 lib/bundler/man/bundle-doctor.1       | 2 +-
 lib/bundler/man/bundle-exec.1         | 2 +-
 lib/bundler/man/bundle-gem.1          | 2 +-
 lib/bundler/man/bundle-help.1         | 2 +-
 lib/bundler/man/bundle-info.1         | 2 +-
 lib/bundler/man/bundle-init.1         | 2 +-
 lib/bundler/man/bundle-inject.1       | 2 +-
 lib/bundler/man/bundle-install.1      | 4 ++--
 lib/bundler/man/bundle-install.1.ronn | 3 +--
 lib/bundler/man/bundle-list.1         | 2 +-
 lib/bundler/man/bundle-lock.1         | 2 +-
 lib/bundler/man/bundle-open.1         | 2 +-
 lib/bundler/man/bundle-outdated.1     | 2 +-
 lib/bundler/man/bundle-platform.1     | 2 +-
 lib/bundler/man/bundle-plugin.1       | 2 +-
 lib/bundler/man/bundle-pristine.1     | 2 +-
 lib/bundler/man/bundle-remove.1       | 2 +-
 lib/bundler/man/bundle-show.1         | 2 +-
 lib/bundler/man/bundle-update.1       | 2 +-
 lib/bundler/man/bundle-version.1      | 2 +-
 lib/bundler/man/bundle-viz.1          | 2 +-
 lib/bundler/man/bundle.1              | 2 +-
 lib/bundler/man/gemfile.5             | 2 +-
 30 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/lib/bundler/man/bundle-add.1 b/lib/bundler/man/bundle-add.1
index dae05bd9458701..b0c6d2cc90138b 100644
--- a/lib/bundler/man/bundle-add.1
+++ b/lib/bundler/man/bundle-add.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-ADD" "1" "September 2024" ""
+.TH "BUNDLE\-ADD" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-binstubs.1 b/lib/bundler/man/bundle-binstubs.1
index 56c9966e75c1ca..9b4b10d5916692 100644
--- a/lib/bundler/man/bundle-binstubs.1
+++ b/lib/bundler/man/bundle-binstubs.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-BINSTUBS" "1" "September 2024" ""
+.TH "BUNDLE\-BINSTUBS" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-cache.1 b/lib/bundler/man/bundle-cache.1
index d634eef203ee37..ad26879bb95c8c 100644
--- a/lib/bundler/man/bundle-cache.1
+++ b/lib/bundler/man/bundle-cache.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CACHE" "1" "September 2024" ""
+.TH "BUNDLE\-CACHE" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-check.1 b/lib/bundler/man/bundle-check.1
index e15a41e4fddba4..be7b0abfcd05d8 100644
--- a/lib/bundler/man/bundle-check.1
+++ b/lib/bundler/man/bundle-check.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CHECK" "1" "September 2024" ""
+.TH "BUNDLE\-CHECK" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-clean.1 b/lib/bundler/man/bundle-clean.1
index aa5ccf7594fffc..43029c780e5a82 100644
--- a/lib/bundler/man/bundle-clean.1
+++ b/lib/bundler/man/bundle-clean.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CLEAN" "1" "September 2024" ""
+.TH "BUNDLE\-CLEAN" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1
index 47104fb5c65b4d..3b46955e0eabf7 100644
--- a/lib/bundler/man/bundle-config.1
+++ b/lib/bundler/man/bundle-config.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CONFIG" "1" "September 2024" ""
+.TH "BUNDLE\-CONFIG" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-console.1 b/lib/bundler/man/bundle-console.1
index f2b2ddaed055bc..720318ec841b3a 100644
--- a/lib/bundler/man/bundle-console.1
+++ b/lib/bundler/man/bundle-console.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-CONSOLE" "1" "September 2024" ""
+.TH "BUNDLE\-CONSOLE" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-console\fR \- Deprecated way to open an IRB session with the bundle pre\-loaded
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-doctor.1 b/lib/bundler/man/bundle-doctor.1
index f225d0cd791fbe..21c1777241e936 100644
--- a/lib/bundler/man/bundle-doctor.1
+++ b/lib/bundler/man/bundle-doctor.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-DOCTOR" "1" "September 2024" ""
+.TH "BUNDLE\-DOCTOR" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-doctor\fR \- Checks the bundle for common problems
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-exec.1 b/lib/bundler/man/bundle-exec.1
index e16b7bc7474b56..a4e74e6b60e96b 100644
--- a/lib/bundler/man/bundle-exec.1
+++ b/lib/bundler/man/bundle-exec.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-EXEC" "1" "September 2024" ""
+.TH "BUNDLE\-EXEC" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-gem.1 b/lib/bundler/man/bundle-gem.1
index e6e58cd409382f..54be9f4891dd5b 100644
--- a/lib/bundler/man/bundle-gem.1
+++ b/lib/bundler/man/bundle-gem.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-GEM" "1" "September 2024" ""
+.TH "BUNDLE\-GEM" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-help.1 b/lib/bundler/man/bundle-help.1
index d7a05f824e972f..7058ed8172cccf 100644
--- a/lib/bundler/man/bundle-help.1
+++ b/lib/bundler/man/bundle-help.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-HELP" "1" "September 2024" ""
+.TH "BUNDLE\-HELP" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-help\fR \- Displays detailed help for each subcommand
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-info.1 b/lib/bundler/man/bundle-info.1
index 6b401a57f42bca..7a47949c029cf1 100644
--- a/lib/bundler/man/bundle-info.1
+++ b/lib/bundler/man/bundle-info.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-INFO" "1" "September 2024" ""
+.TH "BUNDLE\-INFO" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-info\fR \- Show information for the given gem in your bundle
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-init.1 b/lib/bundler/man/bundle-init.1
index f2e444c7c283f8..96b2a7d78f9209 100644
--- a/lib/bundler/man/bundle-init.1
+++ b/lib/bundler/man/bundle-init.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-INIT" "1" "September 2024" ""
+.TH "BUNDLE\-INIT" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-init\fR \- Generates a Gemfile into the current working directory
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-inject.1 b/lib/bundler/man/bundle-inject.1
index 8eb3633837cf0c..20e4a824c4b91b 100644
--- a/lib/bundler/man/bundle-inject.1
+++ b/lib/bundler/man/bundle-inject.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-INJECT" "1" "September 2024" ""
+.TH "BUNDLE\-INJECT" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-install.1 b/lib/bundler/man/bundle-install.1
index 7539d18f81fd9b..ffdbec98c22c91 100644
--- a/lib/bundler/man/bundle-install.1
+++ b/lib/bundler/man/bundle-install.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-INSTALL" "1" "September 2024" ""
+.TH "BUNDLE\-INSTALL" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
 .SH "SYNOPSIS"
@@ -66,7 +66,7 @@ The location to install the specified gems to\. This defaults to Rubygems' setti
 This option is deprecated in favor of the \fBpath\fR setting\.
 .TP
 \fB\-\-quiet\fR
-Do not print progress information to the standard output\. Instead, Bundler will exit using a status code (\fB$?\fR)\.
+Do not print progress information to the standard output\.
 .TP
 \fB\-\-retry=[<number>]\fR
 Retry failed network or git requests for \fInumber\fR times\.
diff --git a/lib/bundler/man/bundle-install.1.ronn b/lib/bundler/man/bundle-install.1.ronn
index ed8169de052a5a..1187455c92b7b3 100644
--- a/lib/bundler/man/bundle-install.1.ronn
+++ b/lib/bundler/man/bundle-install.1.ronn
@@ -136,8 +136,7 @@ automatically and that requires `bundler` to silently remember them. Since
   This option is deprecated in favor of the `path` setting.
 
 * `--quiet`:
-  Do not print progress information to the standard output. Instead, Bundler
-  will exit using a status code (`$?`).
+  Do not print progress information to the standard output.
 
 * `--retry=[<number>]`:
   Retry failed network or git requests for <number> times.
diff --git a/lib/bundler/man/bundle-list.1 b/lib/bundler/man/bundle-list.1
index 5cbb1c3cfe6215..41d9de5e8c5df1 100644
--- a/lib/bundler/man/bundle-list.1
+++ b/lib/bundler/man/bundle-list.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-LIST" "1" "September 2024" ""
+.TH "BUNDLE\-LIST" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-list\fR \- List all the gems in the bundle
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-lock.1 b/lib/bundler/man/bundle-lock.1
index 5f0d43a9aa9041..2fa3dbaebbf1c8 100644
--- a/lib/bundler/man/bundle-lock.1
+++ b/lib/bundler/man/bundle-lock.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-LOCK" "1" "September 2024" ""
+.TH "BUNDLE\-LOCK" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-open.1 b/lib/bundler/man/bundle-open.1
index fb5ff1fee71cb3..befe20caa59e17 100644
--- a/lib/bundler/man/bundle-open.1
+++ b/lib/bundler/man/bundle-open.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-OPEN" "1" "September 2024" ""
+.TH "BUNDLE\-OPEN" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-outdated.1 b/lib/bundler/man/bundle-outdated.1
index ea3005dd87d829..4028aa943afbd2 100644
--- a/lib/bundler/man/bundle-outdated.1
+++ b/lib/bundler/man/bundle-outdated.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-OUTDATED" "1" "September 2024" ""
+.TH "BUNDLE\-OUTDATED" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-outdated\fR \- List installed gems with newer versions available
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-platform.1 b/lib/bundler/man/bundle-platform.1
index c3058175fc8d75..9436800771b267 100644
--- a/lib/bundler/man/bundle-platform.1
+++ b/lib/bundler/man/bundle-platform.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-PLATFORM" "1" "September 2024" ""
+.TH "BUNDLE\-PLATFORM" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-platform\fR \- Displays platform compatibility information
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-plugin.1 b/lib/bundler/man/bundle-plugin.1
index 34437d99739e19..ffaac44558524f 100644
--- a/lib/bundler/man/bundle-plugin.1
+++ b/lib/bundler/man/bundle-plugin.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-PLUGIN" "1" "September 2024" ""
+.TH "BUNDLE\-PLUGIN" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-plugin\fR \- Manage Bundler plugins
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-pristine.1 b/lib/bundler/man/bundle-pristine.1
index 103c6f68ae040b..91deb5c72b59d8 100644
--- a/lib/bundler/man/bundle-pristine.1
+++ b/lib/bundler/man/bundle-pristine.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-PRISTINE" "1" "September 2024" ""
+.TH "BUNDLE\-PRISTINE" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-remove.1 b/lib/bundler/man/bundle-remove.1
index 4a2ed4eb132007..eaf3e624c9087f 100644
--- a/lib/bundler/man/bundle-remove.1
+++ b/lib/bundler/man/bundle-remove.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-REMOVE" "1" "September 2024" ""
+.TH "BUNDLE\-REMOVE" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-remove\fR \- Removes gems from the Gemfile
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-show.1 b/lib/bundler/man/bundle-show.1
index dfbb43921855b3..3e48ca67f1febc 100644
--- a/lib/bundler/man/bundle-show.1
+++ b/lib/bundler/man/bundle-show.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-SHOW" "1" "September 2024" ""
+.TH "BUNDLE\-SHOW" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-update.1 b/lib/bundler/man/bundle-update.1
index 5eb9514f03e82c..55cd40bfe4be25 100644
--- a/lib/bundler/man/bundle-update.1
+++ b/lib/bundler/man/bundle-update.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-UPDATE" "1" "September 2024" ""
+.TH "BUNDLE\-UPDATE" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-update\fR \- Update your gems to the latest available versions
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-version.1 b/lib/bundler/man/bundle-version.1
index a29858181a8ba9..003931cb4784ef 100644
--- a/lib/bundler/man/bundle-version.1
+++ b/lib/bundler/man/bundle-version.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-VERSION" "1" "September 2024" ""
+.TH "BUNDLE\-VERSION" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-version\fR \- Prints Bundler version information
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle-viz.1 b/lib/bundler/man/bundle-viz.1
index 9609e098dd85d5..2848ba18777bb4 100644
--- a/lib/bundler/man/bundle-viz.1
+++ b/lib/bundler/man/bundle-viz.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-VIZ" "1" "September 2024" ""
+.TH "BUNDLE\-VIZ" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/bundle.1 b/lib/bundler/man/bundle.1
index d84d788748a348..688c29961a7e43 100644
--- a/lib/bundler/man/bundle.1
+++ b/lib/bundler/man/bundle.1
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE" "1" "September 2024" ""
+.TH "BUNDLE" "1" "October 2024" ""
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management
 .SH "SYNOPSIS"
diff --git a/lib/bundler/man/gemfile.5 b/lib/bundler/man/gemfile.5
index f24a1c540d904e..dcf4b34c5f7aa3 100644
--- a/lib/bundler/man/gemfile.5
+++ b/lib/bundler/man/gemfile.5
@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "GEMFILE" "5" "September 2024" ""
+.TH "GEMFILE" "5" "October 2024" ""
 .SH "NAME"
 \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
 .SH "SYNOPSIS"

From eb8cf1d60e4436bfebf52fbf4342ee6e5e18ba05 Mon Sep 17 00:00:00 2001
From: Taketo Takashima <t.taketo1113@gmail.com>
Date: Thu, 16 Nov 2023 17:53:32 +0900
Subject: [PATCH 128/140] [ruby/ipaddr] Added to_json/as_json method

Updated to use cidr method when return address with prefix in #as_json

https://github.com/ruby/ipaddr/commit/cf8181d53e
---
 lib/ipaddr.rb       | 16 ++++++++++++++++
 test/test_ipaddr.rb | 14 ++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index dbb213c90adfd3..b40d5c0359aeb1 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -227,6 +227,22 @@ def to_string
     return str
   end
 
+  # Returns a string containing the IP address representation with prefix.
+  def as_json(*)
+    if ipv4? && prefix == 32
+      to_s
+    elsif ipv6? && prefix == 128
+      to_s
+    else
+      cidr
+    end
+  end
+
+  # Returns a json string containing the IP address representation.
+  def to_json(*)
+    format("\"%s\"", as_json)
+  end
+
   # Returns a string containing the IP address representation in
   # cidr notation
   def cidr
diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb
index 3e5c3d2aa4e63b..f2b7ed713f39c2 100644
--- a/test/test_ipaddr.rb
+++ b/test/test_ipaddr.rb
@@ -260,6 +260,20 @@ def test_to_s
     assert_equal("3ffe:505:2::1", IPAddr.new("3ffe:505:2::1").to_s)
   end
 
+  def test_as_json
+    assert_equal("192.168.1.2", IPAddr.new("192.168.1.2").as_json)
+    assert_equal("192.168.1.0/24", IPAddr.new("192.168.1.2/24").as_json)
+    assert_equal("2001:200:300::1", IPAddr.new("2001:200:300::1").as_json)
+    assert_equal("2001:200:300::/48", IPAddr.new("2001:200:300::/48").as_json)
+  end
+
+  def test_to_json
+    assert_equal("\"192.168.1.2\"", IPAddr.new("192.168.1.2").to_json)
+    assert_equal("\"192.168.1.0/24\"", IPAddr.new("192.168.1.2/24").to_json)
+    assert_equal("\"2001:200:300::1\"", IPAddr.new("2001:200:300::1").to_json)
+    assert_equal("\"2001:200:300::/48\"", IPAddr.new("2001:200:300::/48").to_json)
+  end
+
   def test_netmask
     a = IPAddr.new("192.168.1.2/8")
     assert_equal(a.netmask, "255.0.0.0")

From 161ea389af16f33db25a96ad7ee970bee3a3defe Mon Sep 17 00:00:00 2001
From: BurdetteLamar <burdettelamar@yahoo.com>
Date: Thu, 17 Oct 2024 16:51:26 -0500
Subject: [PATCH 129/140] [DOC] Tweaks for Array#sort_by!

---
 array.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/array.c b/array.c
index 52e103989baa05..48614e1ecdde46 100644
--- a/array.c
+++ b/array.c
@@ -3556,28 +3556,24 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy))
 
 /*
  *  call-seq:
- *    array.sort_by! {|element| ... } -> self
- *    array.sort_by! -> new_enumerator
+ *    sort_by! {|element| ... } -> self
+ *    sort_by! -> new_enumerator
  *
- *  Sorts the elements of +self+ in place,
- *  using an ordering determined by the block; returns self.
+ *  With a block given, sorts the elements of +self+ in place;
+ *  returns self.
  *
  *  Calls the block with each successive element;
- *  sorts elements based on the values returned from the block.
- *
- *  For duplicates returned by the block, the ordering is indeterminate, and may be unstable.
- *
- *  This example sorts strings based on their sizes:
+ *  sorts elements based on the values returned from the block:
  *
  *    a = ['aaaa', 'bbb', 'cc', 'd']
  *    a.sort_by! {|element| element.size }
  *    a # => ["d", "cc", "bbb", "aaaa"]
  *
- *  Returns a new Enumerator if no block given:
+ *  For duplicate values returned by the block, the ordering is indeterminate, and may be unstable.
  *
- *    a = ['aaaa', 'bbb', 'cc', 'd']
- *    a.sort_by! # => #<Enumerator: ["aaaa", "bbb", "cc", "d"]:sort_by!>
+ *  With no block given, returns a new Enumerator.
  *
+ *  Related: see {Methods for Assigning}[rdoc-ref:Array@Methods+for+Assigning].
  */
 
 static VALUE

From d1b5c1095719a6b55fab4f2cdd9fda8d94a45b41 Mon Sep 17 00:00:00 2001
From: BurdetteLamar <burdettelamar@yahoo.com>
Date: Thu, 17 Oct 2024 17:31:28 -0500
Subject: [PATCH 130/140] [DOC] Tweaks for Array#sum

---
 array.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/array.c b/array.c
index 48614e1ecdde46..6d430dfd2e12ba 100644
--- a/array.c
+++ b/array.c
@@ -7924,40 +7924,41 @@ finish_exact_sum(long n, VALUE r, VALUE v, int z)
 
 /*
  * call-seq:
- *   array.sum(init = 0) -> object
- *   array.sum(init = 0) {|element| ... } -> object
+ *   sum(init = 0) -> object
+ *   sum(init = 0) {|element| ... } -> object
  *
- *  When no block is given, returns the object equivalent to:
+ *  With no block given, returns the sum of +init+ and all elements of +self+;
+ *  for array +array+ and value +init+, equivalent to:
  *
  *    sum = init
  *    array.each {|element| sum += element }
  *    sum
  *
- *  For example, <tt>[e1, e2, e3].sum</tt> returns <tt>init + e1 + e2 + e3</tt>.
+ *  For example, <tt>[e0, e1, e2].sum</tt> returns <tt>init + e0 + e1 + e2</tt>.
  *
  *  Examples:
  *
- *    a = [0, 1, 2, 3]
- *    a.sum # => 6
- *    a.sum(100) # => 106
+ *    [0, 1, 2, 3].sum                 # => 6
+ *    [0, 1, 2, 3].sum(100)            # => 106
+ *    ['abc', 'def', 'ghi'].sum('jkl') # => "jklabcdefghi"
+ *    [[:foo, :bar], ['foo', 'bar']].sum([2, 3])
+ *    # => [2, 3, :foo, :bar, "foo", "bar"]
  *
- *  The elements need not be numeric, but must be <tt>+</tt>-compatible
- *  with each other and with +init+:
+ *  The +init+ value and elements need not be numeric, but must all be <tt>+</tt>-compatible:
  *
- *    a = ['abc', 'def', 'ghi']
- *    a.sum('jkl') # => "jklabcdefghi"
+ *    # Raises TypeError: Array can't be coerced into Integer.
+ *    [[:foo, :bar], ['foo', 'bar']].sum(2)
  *
- *  When a block is given, it is called with each element
- *  and the block's return value (instead of the element itself) is used as the addend:
+ *  With a block given, calls the block with each element of +self+;
+ *  the block's return value (instead of the element itself) is used as the addend:
  *
- *    a = ['zero', 1, :two]
- *    s = a.sum('Coerced and concatenated: ') {|element| element.to_s }
- *    s # => "Coerced and concatenated: zero1two"
+ *    ['zero', 1, :two].sum('Coerced and concatenated: ') {|element| element.to_s }
+ *    # => "Coerced and concatenated: zero1two"
  *
  *  Notes:
  *
  *  - Array#join and Array#flatten may be faster than Array#sum
- *    for an +Array+ of Strings or an +Array+ of Arrays.
+ *    for an array of strings or an array of arrays.
  *  - Array#sum method may not respect method redefinition of "+" methods such as Integer#+.
  *
  */

From 689f14e255593172abe31a7669b47b528e47214f Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@idaemons.org>
Date: Sat, 19 Oct 2024 00:53:29 +0900
Subject: [PATCH 131/140] [ruby/ipaddr] Use string interpolation instead of
 format()

https://github.com/ruby/ipaddr/commit/73f59e111f
---
 lib/ipaddr.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index b40d5c0359aeb1..dc33fffcb53625 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -246,7 +246,7 @@ def to_json(*)
   # Returns a string containing the IP address representation in
   # cidr notation
   def cidr
-    format("%s/%s", to_s, prefix)
+    "#{to_s}/#{prefix}"
   end
 
   # Returns a network byte ordered string form of the IP address.

From fce5bbd6a7a20c4a559ade1205e3fdb0f5d003d0 Mon Sep 17 00:00:00 2001
From: Jerome Dalbert <jerome.dalbert@gmail.com>
Date: Wed, 16 Oct 2024 19:17:55 -0700
Subject: [PATCH 132/140] [rubygems/rubygems] Add `bundle add --quiet` option

This option is similar to the `bundle install --quiet` option

https://github.com/rubygems/rubygems/commit/3bd773d827
---
 lib/bundler/cli.rb                |  1 +
 lib/bundler/cli/add.rb            |  2 ++
 lib/bundler/man/bundle-add.1      |  5 ++++-
 lib/bundler/man/bundle-add.1.ronn |  5 ++++-
 spec/bundler/commands/add_spec.rb | 32 +++++++++++++++++++++++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 013ffcdeedc1cd..62ad52f4266862 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -353,6 +353,7 @@ def binstubs(*gems)
     method_option "branch", type: :string
     method_option "ref", type: :string
     method_option "glob", type: :string, banner: "The location of a dependency's .gemspec, expanded within Ruby (single quotes recommended)"
+    method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
     method_option "skip-install", type: :boolean, banner: "Adds gem to the Gemfile but does not install it"
     method_option "optimistic", type: :boolean, banner: "Adds optimistic declaration of version to gem"
     method_option "strict", type: :boolean, banner: "Adds strict declaration of version to gem"
diff --git a/lib/bundler/cli/add.rb b/lib/bundler/cli/add.rb
index 2b300e178395a0..12a681a816886c 100644
--- a/lib/bundler/cli/add.rb
+++ b/lib/bundler/cli/add.rb
@@ -12,6 +12,8 @@ def initialize(options, gems)
     end
 
     def run
+      Bundler.ui.level = "warn" if options[:quiet]
+
       validate_options!
       inject_dependencies
       perform_bundle_install unless options["skip-install"]
diff --git a/lib/bundler/man/bundle-add.1 b/lib/bundler/man/bundle-add.1
index b0c6d2cc90138b..e477f77c5c6ba9 100644
--- a/lib/bundler/man/bundle-add.1
+++ b/lib/bundler/man/bundle-add.1
@@ -4,7 +4,7 @@
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
 .SH "SYNOPSIS"
-\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-path=PATH] [\-\-git=GIT|\-\-github=GITHUB] [\-\-branch=BRANCH] [\-\-ref=REF] [\-\-skip\-install] [\-\-strict|\-\-optimistic]
+\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-path=PATH] [\-\-git=GIT|\-\-github=GITHUB] [\-\-branch=BRANCH] [\-\-ref=REF] [\-\-quiet] [\-\-skip\-install] [\-\-strict|\-\-optimistic]
 .SH "DESCRIPTION"
 Adds the named gem to the [\fBGemfile(5)\fR][Gemfile(5)] and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
 .SH "OPTIONS"
@@ -36,6 +36,9 @@ Specify the git branch for the added gem\.
 \fB\-\-ref\fR
 Specify the git ref for the added gem\.
 .TP
+\fB\-\-quiet\fR
+Do not print progress information to the standard output\.
+.TP
 \fB\-\-skip\-install\fR
 Adds the gem to the Gemfile but does not install it\.
 .TP
diff --git a/lib/bundler/man/bundle-add.1.ronn b/lib/bundler/man/bundle-add.1.ronn
index 8b38c7a2483047..ca098892000540 100644
--- a/lib/bundler/man/bundle-add.1.ronn
+++ b/lib/bundler/man/bundle-add.1.ronn
@@ -5,7 +5,7 @@ bundle-add(1) -- Add gem to the Gemfile and run bundle install
 
 `bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE]
            [--path=PATH] [--git=GIT|--github=GITHUB] [--branch=BRANCH] [--ref=REF]
-           [--skip-install] [--strict|--optimistic]
+           [--quiet] [--skip-install] [--strict|--optimistic]
 
 ## DESCRIPTION
 
@@ -41,6 +41,9 @@ Adds the named gem to the [`Gemfile(5)`][Gemfile(5)] and run `bundle install`.
 * `--ref`:
   Specify the git ref for the added gem.
 
+* `--quiet`:
+  Do not print progress information to the standard output.
+
 * `--skip-install`:
   Adds the gem to the Gemfile but does not install it.
 
diff --git a/spec/bundler/commands/add_spec.rb b/spec/bundler/commands/add_spec.rb
index 0a0d4c004653bd..e63b0b9658f8fd 100644
--- a/spec/bundler/commands/add_spec.rb
+++ b/spec/bundler/commands/add_spec.rb
@@ -284,6 +284,38 @@
     end
   end
 
+  describe "with --quiet option" do
+    it "is quiet when there are no warnings" do
+      bundle "add 'foo' --quiet"
+      expect(out).to be_empty
+      expect(err).to be_empty
+    end
+
+    it "still displays warning and errors" do
+      create_file("add_with_warning.rb", <<~RUBY)
+        require "#{lib_dir}/bundler"
+        require "#{lib_dir}/bundler/cli"
+        require "#{lib_dir}/bundler/cli/add"
+
+        module RunWithWarning
+          def run
+            super
+          rescue
+            Bundler.ui.warn "This is a warning"
+            raise
+          end
+        end
+
+        Bundler::CLI::Add.prepend(RunWithWarning)
+      RUBY
+
+      bundle "add 'non-existing-gem' --quiet", raise_on_error: false, env: { "RUBYOPT" => "-r#{bundled_app("add_with_warning.rb")}" }
+      expect(out).to be_empty
+      expect(err).to include("Could not find gem 'non-existing-gem'")
+      expect(err).to include("This is a warning")
+    end
+  end
+
   describe "with --strict option" do
     it "adds strict version" do
       bundle "add 'foo' --strict"

From fbabe13b7eaa9576a9949b213a0c2cc831011b63 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Fri, 18 Oct 2024 11:17:36 -0400
Subject: [PATCH 133/140] Use rb_id_table_foreach_values for marking Ractor
 local storage

Since we only mark the values, we can use rb_id_table_foreach_values to
avoid the overhead of converting the key to an ID.
---
 ractor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ractor.c b/ractor.c
index 9d34dd1b7d269a..0913c526ea320a 100644
--- a/ractor.c
+++ b/ractor.c
@@ -3638,7 +3638,7 @@ ractor_local_storage_mark_i(st_data_t key, st_data_t val, st_data_t dmy)
 }
 
 static enum rb_id_table_iterator_result
-idkey_local_storage_mark_i(ID id, VALUE val, void *dmy)
+idkey_local_storage_mark_i(VALUE val, void *dmy)
 {
     rb_gc_mark(val);
     return ID_TABLE_CONTINUE;
@@ -3661,7 +3661,7 @@ ractor_local_storage_mark(rb_ractor_t *r)
     }
 
     if (r->idkey_local_storage) {
-        rb_id_table_foreach(r->idkey_local_storage, idkey_local_storage_mark_i, NULL);
+        rb_id_table_foreach_values(r->idkey_local_storage, idkey_local_storage_mark_i, NULL);
     }
 }
 

From 09ddfd4d1ce4c1ba08e05c02bd2a1ec6e046211d Mon Sep 17 00:00:00 2001
From: tomoya ishida <tomoyapenguin@gmail.com>
Date: Sat, 19 Oct 2024 02:15:05 +0900
Subject: [PATCH 134/140] [ruby/irb] Always use alternate sceen on alt-d
 (https://github.com/ruby/irb/pull/988)

https://github.com/ruby/irb/commit/db0a923d62
---
 lib/irb/easter-egg.rb   | 1 -
 lib/irb/input-method.rb | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/irb/easter-egg.rb b/lib/irb/easter-egg.rb
index 14dc93fc9c9a19..bf888483823ed0 100644
--- a/lib/irb/easter-egg.rb
+++ b/lib/irb/easter-egg.rb
@@ -125,7 +125,6 @@ def render_frame(i)
             canvas = Canvas.new(Reline.get_screen_size)
           end
           ruby_model = RubyModel.new
-          print "\e[?1049h"
           0.step do |i| # TODO (0..).each needs Ruby 2.6 or later
             buff = canvas.draw do
               ruby_model.render_frame(i) do |p1, p2|
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index 38f05d771687f9..260d9a1cbf7316 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -348,9 +348,15 @@ def show_doc_dialog_proc
           if show_easter_egg
             IRB.__send__(:easter_egg)
           else
+            # RDoc::RI::Driver#display_names uses pager command internally.
+            # Some pager command like `more` doesn't use alternate screen
+            # so we need to turn on and off alternate screen manually.
             begin
+              print "\e[?1049h"
               driver.display_names([name])
             rescue RDoc::RI::Driver::NotFoundError
+            ensure
+              print "\e[?1049l"
             end
           end
         end

From f370a31578fa2545514af15f753309aa826d0ae8 Mon Sep 17 00:00:00 2001
From: Tsutomu Katsube <tsuto.katsube@gmail.com>
Date: Sat, 19 Oct 2024 02:15:22 +0900
Subject: [PATCH 135/140] [ruby/irb] Suppress "literal string will be frozen in
 the future" warning (https://github.com/ruby/irb/pull/1019)

* Suppress "literal string will be frozen in the future" warning

Before change:

```console
$ ruby -W -I lib -e 'require "irb"; IRB.setup(nil); IRB::Irb.new.build_statement("1 + 2")'
/Users/zzz/src/github.com/ruby/irb/lib/irb.rb:1135: warning: literal string will be frozen in the future
```

After change:

```console
$ ruby -W -I lib -e 'require "irb"; IRB.setup(nil); IRB::Irb.new.build_statement("1 + 2")'
```

* Making build_statement not modify the given argument

Because improves readability and code quality.

Co-authored-by: tomoya ishida <tomoyapenguin@gmail.com>

---------

https://github.com/ruby/irb/commit/3da04b9786

Co-authored-by: tomoya ishida <tomoyapenguin@gmail.com>
---
 lib/irb.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/irb.rb b/lib/irb.rb
index 12eb69c5b187a7..528892797fb3ff 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -1132,7 +1132,7 @@ def build_statement(code)
         return Statement::EmptyInput.new
       end
 
-      code.force_encoding(@context.io.encoding)
+      code = code.dup.force_encoding(@context.io.encoding)
       if (command, arg = @context.parse_command(code))
         command_class = Command.load_command(command)
         Statement::Command.new(code, command_class, arg)

From e17243d3254387ae95b73d9bc6454db36b8e8a43 Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Thu, 17 Oct 2024 13:44:15 -0400
Subject: [PATCH 136/140] Point keyword->table into iseq local table

---
 compile.c       | 17 +++++++++++------
 prism_compile.c | 21 ++++++++++-----------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/compile.c b/compile.c
index 6e78b075182742..5bf496ed596d75 100644
--- a/compile.c
+++ b/compile.c
@@ -12897,19 +12897,17 @@ ibf_load_param_keyword(const struct ibf_load *load, ibf_offset_t param_keyword_o
 {
     if (param_keyword_offset) {
         struct rb_iseq_param_keyword *kw = IBF_R(param_keyword_offset, struct rb_iseq_param_keyword, 1);
-        ID *ids = IBF_R(kw->table, ID, kw->num);
         int dv_num = kw->num - kw->required_num;
         VALUE *dvs = dv_num ? IBF_R(kw->default_values, VALUE, dv_num) : NULL;
-        int i;
 
-        for (i=0; i<kw->num; i++) {
-            ids[i] = ibf_load_id(load, ids[i]);
-        }
+        int i;
         for (i=0; i<dv_num; i++) {
             dvs[i] = ibf_load_object(load, dvs[i]);
         }
 
-        kw->table = ids;
+        // Will be set once the local table is loaded.
+        kw->table = NULL;
+
         kw->default_values = dvs;
         return kw;
     }
@@ -13581,6 +13579,13 @@ ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
     load_body->local_iseq           = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)local_iseq_index);
     load_body->mandatory_only_iseq  = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)mandatory_only_iseq_index);
 
+    // This must be done after the local table is loaded.
+    if (load_body->param.keyword != NULL) {
+        RUBY_ASSERT(load_body->local_table);
+        struct rb_iseq_param_keyword *keyword = (struct rb_iseq_param_keyword *) load_body->param.keyword;
+        keyword->table = &load_body->local_table[keyword->bits_start - keyword->num];
+    }
+
     ibf_load_code(load, iseq, bytecode_offset, bytecode_size, iseq_size);
 #if VM_INSN_INFO_TABLE_IMPL == 2
     rb_iseq_insns_info_encode_positions(iseq);
diff --git a/prism_compile.c b/prism_compile.c
index 04fc96e99098c2..d5b764cd890636 100644
--- a/prism_compile.c
+++ b/prism_compile.c
@@ -6062,17 +6062,12 @@ pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_nod
     //                                                   ^^^^^^^^
     // Keywords create an internal variable on the parse tree
     if (keywords_list && keywords_list->size) {
-        body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+        keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
         keyword->num = (int) keywords_list->size;
 
-        body->param.flags.has_kw = true;
         const VALUE default_values = rb_ary_hidden_new(1);
         const VALUE complex_mark = rb_str_tmp_new(0);
 
-        ID *ids = xcalloc(keywords_list->size, sizeof(ID));
-
-        size_t kw_index = 0;
-
         for (size_t i = 0; i < keywords_list->size; i++) {
             pm_node_t *keyword_parameter_node = keywords_list->nodes[i];
             pm_constant_id_t name;
@@ -6091,7 +6086,6 @@ pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_nod
                     pm_insert_local_index(name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
                 }
                 local_index++;
-                ids[kw_index++] = local;
             }
         }
 
@@ -6121,15 +6115,11 @@ pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_nod
                 else {
                     pm_insert_local_index(name, local_index, index_lookup_table, local_table_for_iseq, scope_node);
                 }
-                ids[kw_index++] = local;
                 local_index++;
             }
 
         }
 
-        keyword->bits_start = local_index;
-        keyword->table = ids;
-
         if (RARRAY_LEN(default_values)) {
             VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
 
@@ -6143,9 +6133,13 @@ pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_nod
         }
 
         // Hidden local for keyword arguments
+        keyword->bits_start = local_index;
         ID local = rb_make_temporary_id(local_index);
         local_table_for_iseq->ids[local_index] = local;
         local_index++;
+
+        body->param.keyword = keyword;
+        body->param.flags.has_kw = true;
     }
 
     if (body->type == ISEQ_TYPE_BLOCK && local_index == 1 && requireds_list && requireds_list->size == 1 && !trailing_comma) {
@@ -6372,6 +6366,11 @@ pm_compile_scope_node(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_nod
     iseq_set_local_table(iseq, local_table_for_iseq, 0);
     scope_node->local_table_for_iseq_size = local_table_for_iseq->size;
 
+    if (keyword != NULL) {
+        size_t keyword_start_index = keyword->bits_start - keyword->num;
+        keyword->table = (ID *)&ISEQ_BODY(iseq)->local_table[keyword_start_index];
+    }
+
     //********STEP 5************
     // Goal: compile anything that needed to be compiled
     if (optionals_list && optionals_list->size) {

From 7be9a333cabd97a17a2926b15f756f2ef9e57243 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@hawthorn.email>
Date: Fri, 18 Oct 2024 12:01:45 -0700
Subject: [PATCH 137/140] YJIT: Allow shareable consts in multi-ractor mode
 (#11917)

* Update yjit-bindgen deps

* YJIT: Allow shareable consts in multi-ractor mode

* Update yjit/src/codegen.rs

Co-authored-by: Alan Wu <XrXr@users.noreply.github.com>

---------

Co-authored-by: Alan Wu <XrXr@users.noreply.github.com>
---
 vm_core.h                      |   2 +
 vm_insnhelper.c                |   2 -
 yjit.c                         |   6 +
 yjit/bindgen/Cargo.lock        | 352 +++++++++++++++------------------
 yjit/bindgen/Cargo.toml        |   4 +-
 yjit/bindgen/src/main.rs       |   4 +-
 yjit/src/codegen.rs            |  13 +-
 yjit/src/cruby_bindings.inc.rs |   5 +-
 8 files changed, 179 insertions(+), 209 deletions(-)

diff --git a/vm_core.h b/vm_core.h
index bce5f35763383c..9aa93b7e21010c 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -230,6 +230,8 @@ union ic_serial_entry {
     VALUE data[2];
 };
 
+#define IMEMO_CONST_CACHE_SHAREABLE IMEMO_FL_USER0
+
 // imemo_constcache
 struct iseq_inline_constant_cache_entry {
     VALUE flags;
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 695332272743b6..b8beacf87bbe45 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -6273,8 +6273,6 @@ rb_vm_opt_newarray_pack(rb_execution_context_t *ec, rb_num_t num, const VALUE *p
 
 #undef id_cmp
 
-#define IMEMO_CONST_CACHE_SHAREABLE IMEMO_FL_USER0
-
 static void
 vm_track_constant_cache(ID id, void *ic)
 {
diff --git a/yjit.c b/yjit.c
index 737372daa14b20..4c21962f8cc29c 100644
--- a/yjit.c
+++ b/yjit.c
@@ -1062,6 +1062,12 @@ rb_IMEMO_TYPE_P(VALUE imemo, enum imemo_type imemo_type)
     return IMEMO_TYPE_P(imemo, imemo_type);
 }
 
+bool
+rb_yjit_constcache_shareable(const struct iseq_inline_constant_cache_entry *ice)
+{
+    return (ice->flags & IMEMO_CONST_CACHE_SHAREABLE) != 0;
+}
+
 void
 rb_assert_cme_handle(VALUE handle)
 {
diff --git a/yjit/bindgen/Cargo.lock b/yjit/bindgen/Cargo.lock
index 6338d9fea8ad4d..e5c6b2a1ed6a2c 100644
--- a/yjit/bindgen/Cargo.lock
+++ b/yjit/bindgen/Cargo.lock
@@ -4,52 +4,87 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "bindgen"
-version = "0.63.0"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "cexpr",
  "clang-sys",
- "lazy_static",
- "lazycell",
+ "itertools",
  "log",
- "peeking_take_while",
+ "prettyplease",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
  "syn",
- "which",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "cexpr"
@@ -68,9 +103,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clang-sys"
-version = "1.4.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -78,56 +113,45 @@ dependencies = [
 ]
 
 [[package]]
-name = "either"
-version = "1.8.0"
+name = "colorchoice"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
-name = "env_logger"
-version = "0.10.0"
+name = "either"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "env_filter"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
+ "log",
+ "regex",
 ]
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "env_logger"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
- "cc",
- "libc",
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
 ]
 
 [[package]]
 name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "hermit-abi"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "humantime"
@@ -136,64 +160,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
-name = "is-terminal"
-version = "0.4.8"
+name = "is_terminal_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys",
-]
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
+name = "itertools"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "winapi",
+ "windows-targets",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
-
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minimal-lexical"
@@ -203,49 +210,59 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "nom"
-version = "7.1.1"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
-
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
+name = "prettyplease"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -254,9 +271,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-hash"
@@ -264,19 +281,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustix"
-version = "0.38.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
-dependencies = [
- "bitflags 2.4.1",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -285,90 +289,46 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
-name = "which"
-version = "4.3.0"
+name = "utf8parse"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
+ "windows_i686_gnullvm",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
@@ -377,45 +337,51 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "yjit-bindgen"
diff --git a/yjit/bindgen/Cargo.toml b/yjit/bindgen/Cargo.toml
index a85c04cf0e99c3..8c1b5330066e74 100644
--- a/yjit/bindgen/Cargo.toml
+++ b/yjit/bindgen/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bindgen = "0.63.0"
-env_logger = "0.10.0"
+bindgen = "0.70.1"
+env_logger = "0.11.5"
diff --git a/yjit/bindgen/src/main.rs b/yjit/bindgen/src/main.rs
index 28e7ac3e9c7a63..649d540c9434d0 100644
--- a/yjit/bindgen/src/main.rs
+++ b/yjit/bindgen/src/main.rs
@@ -61,9 +61,6 @@ fn main() {
         .blocklist_type("size_t")
         .blocklist_type("fpos_t")
 
-        // Prune these types since they are system dependant and we don't use them
-        .blocklist_type("__.*")
-
         // Import YARV bytecode instruction constants
         .allowlist_type("ruby_vminsn_type")
 
@@ -327,6 +324,7 @@ fn main() {
         .allowlist_function("rb_yjit_vm_unlock")
         .allowlist_function("rb_assert_(iseq|cme)_handle")
         .allowlist_function("rb_IMEMO_TYPE_P")
+        .allowlist_function("rb_yjit_constcache_shareable")
         .allowlist_function("rb_iseq_reset_jit_func")
         .allowlist_function("rb_yjit_dump_iseq_loc")
         .allowlist_function("rb_yjit_for_each_iseq")
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
index 86f39414a995df..0f5274a4a08fef 100644
--- a/yjit/src/codegen.rs
+++ b/yjit/src/codegen.rs
@@ -9915,11 +9915,16 @@ fn gen_opt_getconstant_path(
         return Some(EndBlock);
     }
 
-    if !unsafe { (*ice).ic_cref }.is_null() {
+    let cref_sensitive = !unsafe { (*ice).ic_cref }.is_null();
+    let is_shareable = unsafe { rb_yjit_constcache_shareable(ice) };
+    let needs_checks = cref_sensitive || (!is_shareable && !assume_single_ractor_mode(jit, asm));
+
+    if needs_checks {
         // Cache is keyed on a certain lexical scope. Use the interpreter's cache.
         let inline_cache = asm.load(Opnd::const_ptr(ic as *const u8));
 
         // Call function to verify the cache. It doesn't allocate or call methods.
+        // This includes a check for Ractor safety
         let ret_val = asm.ccall(
             rb_vm_ic_hit_p as *const u8,
             vec![inline_cache, Opnd::mem(64, CFP, RUBY_OFFSET_CFP_EP)]
@@ -9948,12 +9953,6 @@ fn gen_opt_getconstant_path(
         let stack_top = asm.stack_push(Type::Unknown);
         asm.store(stack_top, ic_entry_val);
     } else {
-        // Optimize for single ractor mode.
-        if !assume_single_ractor_mode(jit, asm) {
-            gen_counter_incr(jit, asm, Counter::opt_getconstant_path_multi_ractor);
-            return None;
-        }
-
         // Invalidate output code on any constant writes associated with
         // constants referenced within the current block.
         jit.assume_stable_constant_names(asm, idlist);
diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs
index 147d30e2026076..8b53098cc990f9 100644
--- a/yjit/src/cruby_bindings.inc.rs
+++ b/yjit/src/cruby_bindings.inc.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.63.0 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
@@ -135,7 +135,7 @@ impl<T> ::std::default::Default for __BindgenUnionField<T> {
 impl<T> ::std::clone::Clone for __BindgenUnionField<T> {
     #[inline]
     fn clone(&self) -> Self {
-        Self::new()
+        *self
     }
 }
 impl<T> ::std::marker::Copy for __BindgenUnionField<T> {}
@@ -1257,6 +1257,7 @@ extern "C" {
     pub fn rb_yjit_multi_ractor_p() -> bool;
     pub fn rb_assert_iseq_handle(handle: VALUE);
     pub fn rb_IMEMO_TYPE_P(imemo: VALUE, imemo_type: imemo_type) -> ::std::os::raw::c_int;
+    pub fn rb_yjit_constcache_shareable(ice: *const iseq_inline_constant_cache_entry) -> bool;
     pub fn rb_assert_cme_handle(handle: VALUE);
     pub fn rb_yjit_for_each_iseq(callback: rb_iseq_callback, data: *mut ::std::os::raw::c_void);
     pub fn rb_yjit_obj_written(

From bfc586b2be70c66062581556e647757cf92804fd Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@idaemons.org>
Date: Sat, 19 Oct 2024 21:56:19 +0900
Subject: [PATCH 138/140] [ruby/ipaddr] Use string interpolation instead of
 format()

https://github.com/ruby/ipaddr/commit/1f41cd7320
---
 lib/ipaddr.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index dc33fffcb53625..e802c8817e92ee 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -239,8 +239,8 @@ def as_json(*)
   end
 
   # Returns a json string containing the IP address representation.
-  def to_json(*)
-    format("\"%s\"", as_json)
+  def to_json(*a)
+    %Q{"#{as_json(*a)}"}
   end
 
   # Returns a string containing the IP address representation in

From b101ca598ef7a0b7c81efe673fea52378c1564b4 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@idaemons.org>
Date: Sat, 19 Oct 2024 21:58:42 +0900
Subject: [PATCH 139/140] [ruby/ipaddr] Bump the version to 1.2.7

https://github.com/ruby/ipaddr/commit/b44d2a1173
---
 lib/ipaddr.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index e802c8817e92ee..a45055496c0f1c 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -40,7 +40,7 @@
 #   p ipaddr3                   #=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
 
 class IPAddr
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 
   # 32 bit mask for IPv4
   IN4MASK = 0xffffffff

From 1c653cabfc87e71dec9024385fc54472578a178c Mon Sep 17 00:00:00 2001
From: git <svn-admin@ruby-lang.org>
Date: Sat, 19 Oct 2024 13:00:02 +0000
Subject: [PATCH 140/140] Update default gems list at
 b101ca598ef7a0b7c81efe673fea52 [ci skip]

---
 NEWS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS.md b/NEWS.md
index 0ae8c4cb76b000..17e8d833df26c8 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -82,6 +82,7 @@ The following default gems are updated.
 * erb 4.0.4
 * fiddle 1.1.4.dev
 * io-console 0.7.2
+* ipaddr 1.2.7
 * irb 1.14.1
 * json 2.7.2
 * logger 1.6.1