[pull] master from ruby:master

NEWS.md

@@ -191,7 +191,7 @@ The following default gems are updated.
 * fileutils 1.8.0
 * io-console 0.8.1
 * io-nonblock 0.3.2
-* io-wait 0.3.2
+* io-wait 0.3.3
 * json 2.15.2
 * net-http 0.7.0
 * openssl 4.0.0.pre

ext/io/wait/io-wait.gemspec

@@ -1,4 +1,4 @@
-_VERSION = "0.3.2"
+_VERSION = "0.3.3"
 
 Gem::Specification.new do |spec|
   spec.name          = "io-wait"

ext/strscan/strscan.c

@@ -30,7 +30,6 @@ extern size_t onig_region_memsize(const struct re_registers *regs);
 
 static VALUE StringScanner;
 static VALUE ScanError;
-static ID id_byteslice;
 
 static int usascii_encindex, utf8_encindex, binary_encindex;
 
@@ -2287,8 +2286,6 @@ Init_strscan(void)
     ID id_scanerr = rb_intern("ScanError");
     VALUE tmp;
 
-    id_byteslice = rb_intern("byteslice");
-
     usascii_encindex = rb_usascii_encindex();
     utf8_encindex = rb_utf8_encindex();
     binary_encindex = rb_ascii8bit_encindex();

gc.c

@@ -620,6 +620,7 @@ typedef struct gc_function_map {
     void (*config_set)(void *objspace_ptr, VALUE hash);
     void (*stress_set)(void *objspace_ptr, VALUE flag);
     VALUE (*stress_get)(void *objspace_ptr);
+    bool (*checking_shareable)(void *objspace_ptr);
     // Object allocation
     VALUE (*new_obj)(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, bool wb_protected, size_t alloc_size);
     size_t (*obj_slot_size)(VALUE obj);
@@ -794,6 +795,7 @@ ruby_modular_gc_init(void)
     load_modular_gc_func(config_get);
     load_modular_gc_func(stress_set);
     load_modular_gc_func(stress_get);
+    load_modular_gc_func(checking_shareable);
     // Object allocation
     load_modular_gc_func(new_obj);
     load_modular_gc_func(obj_slot_size);
@@ -874,6 +876,7 @@ ruby_modular_gc_init(void)
 # define rb_gc_impl_config_set rb_gc_functions.config_set
 # define rb_gc_impl_stress_set rb_gc_functions.stress_set
 # define rb_gc_impl_stress_get rb_gc_functions.stress_get
+# define rb_gc_impl_checking_shareable rb_gc_functions.checking_shareable
 // Object allocation
 # define rb_gc_impl_new_obj rb_gc_functions.new_obj
 # define rb_gc_impl_obj_slot_size rb_gc_functions.obj_slot_size
@@ -2804,8 +2807,6 @@ mark_m_tbl(void *objspace, struct rb_id_table *tbl)
     }
 }
 
-bool rb_gc_impl_checking_shareable(void *objspace_ptr); // in defaut/deafult.c
-
 bool
 rb_gc_checking_shareable(void)
 {

gc/gc_impl.h

@@ -54,6 +54,7 @@ GC_IMPL_FN void rb_gc_impl_stress_set(void *objspace_ptr, VALUE flag);
 GC_IMPL_FN VALUE rb_gc_impl_stress_get(void *objspace_ptr);
 GC_IMPL_FN VALUE rb_gc_impl_config_get(void *objspace_ptr);
 GC_IMPL_FN void rb_gc_impl_config_set(void *objspace_ptr, VALUE hash);
+GC_IMPL_FN bool rb_gc_impl_checking_shareable(void *objspace_ptr);
 // Object allocation
 GC_IMPL_FN VALUE rb_gc_impl_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, bool wb_protected, size_t alloc_size);
 GC_IMPL_FN size_t rb_gc_impl_obj_slot_size(VALUE obj);

test/stringio/test_stringio.rb

@@ -1064,6 +1064,20 @@ def test_coderange_after_overwrite
     assert_predicate(s.string, :ascii_only?)
   end
 
+  def test_coderange_after_read_into_buffer
+    s = StringIO.new("01234567890".b)
+
+    buf = "¿Cómo estás? Ça va bien?"
+    assert_not_predicate(buf, :ascii_only?)
+
+    assert_predicate(s.string, :ascii_only?)
+
+    s.read(10, buf)
+
+    assert_predicate(buf, :ascii_only?)
+    assert_equal '0123456789', buf
+  end
+
   require "objspace"
   if ObjectSpace.respond_to?(:dump) && ObjectSpace.dump(eval(%{"test"})).include?('"chilled":true') # Ruby 3.4+ chilled strings
     def test_chilled_string

vm_args.c

@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  vm_args.c - process method call arguments.
+  vm_args.c - process method call arguments. Included into vm.c.
 
   $Author$
 

vm_eval.c

@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  vm_eval.c -
+  vm_eval.c - Included into vm.c.
 
   $Author$
   created at: Sat May 24 16:02:32 JST 2008

vm_insnhelper.c

@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  vm_insnhelper.c - instruction helper functions.
+  vm_insnhelper.c - instruction helper functions. Included into vm.c.
 
   $Author$