Merge branch 'ruby:master' into nmeans/zjit-array-splice-aset

Author: nmeans

NEWS.md

@@ -47,9 +47,10 @@ Other changes are listed in the following sections. We also listed release
 history from the previous bundled version that is Ruby 3.4.0 if it has GitHub
 releases.
 
-### The following bundled gem is promoted from default gems.
+### The following bundled gems are promoted from default gems.
 
 * tsort 0.2.0
+* win32-registry 0.1.2
 
 ### The following default gem is added.
 
@@ -80,6 +81,7 @@ releases.
 * repl_type_completor 0.1.13
 * pstore 0.2.1
 * rdoc 7.2.0
+* win32ole 1.9.3
 * irb 1.17.0
 
 ### RubyGems and Bundler

bootstraptest/test_yjit.rb

@@ -5486,3 +5486,52 @@ def test = foo(1)
   test
   test
 }
+
+# regression test for tracing invalidation with on-stack compiled methods
+# Exercises the on_stack_iseqs path in rb_yjit_tracing_invalidate_all
+# where delayed deallocation must not create aliasing &mut references
+# to IseqPayload (use-after-free of version_map backing storage).
+assert_normal_exit %q{
+  def deep = 42
+  def mid = deep
+  def outer = mid
+
+  # Compile all three methods with YJIT
+  10.times { outer }
+
+  # Enable tracing from within a call chain so that outer/mid/deep
+  # are on the stack when rb_yjit_tracing_invalidate_all runs.
+  # This triggers the on_stack_iseqs (delayed deallocation) path.
+  def deep
+    TracePoint.new(:line) {}.enable
+    42
+  end
+
+  outer
+
+  # After invalidation, verify YJIT can recompile and run correctly
+  def deep = 42
+  10.times { outer }
+}
+
+# regression test for tracing invalidation with on-stack fibers
+# Suspended fibers have iseqs on their stack that must survive invalidation.
+assert_equal '42', %q{
+  def compiled_method
+    Fiber.yield
+    42
+  end
+
+  # Compile the method
+  10.times { compiled_method rescue nil }
+
+  fiber = Fiber.new { compiled_method }
+  fiber.resume # suspends inside compiled_method — it's now on the fiber's stack
+
+  # Enable tracing while compiled_method is on the fiber's stack.
+  # This triggers rb_yjit_tracing_invalidate_all with on-stack iseqs.
+  TracePoint.new(:call) {}.enable
+
+  # Resume the fiber — compiled_method's iseq must still be valid
+  fiber.resume.to_s
+}

common.mk

@@ -800,7 +800,10 @@ RUBYSPEC_CAPIEXT_SRCDIR = $(srcdir)/$(RUBYSPEC_CAPIEXT)
 RUBYSPEC_CAPIEXT_DEPS = $(RUBYSPEC_CAPIEXT_SRCDIR)/rubyspec.h $(RUBY_H_INCLUDES) {$(VPATH)}internal/abi.h $(LIBRUBY)
 RUBYSPEC_CAPIEXT_BUILD = $(enable_shared:yes=rubyspec-capiext)
 
-rubyspec-capiext: build-ext $(DOT_WAIT)
+yes-rubyspec-capiext: build-ext
+	$(ACTIONS_GROUP)
+rubyspec-capiext: build-ext $(DOT_WAIT) yes-rubyspec-capiext $(DOT_WAIT)
+	$(ACTIONS_ENDGROUP)
 # make-dependent rules should be included after this and built after build-ext.
 
 clean-spec: PHONY

defs/gmake.mk

@@ -516,7 +516,7 @@ fix-depends check-depends: all hello
 # order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT)
 # because the same named directory exists in the source tree.
 $(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(RUBYSPEC_CAPIEXT_DEPS) \
-	| build-ext
+	| build-ext yes-rubyspec-capiext
 	$(no_silence:no=$(ECHO) building $@)
 	$(Q) $(MAKEDIRS) $(@D)
 	$(Q) $(DLDSHARED) -L. $(XDLDFLAGS) $(XLDFLAGS) $(LDFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBYARG)
@@ -525,9 +525,8 @@ ifneq ($(POSTLINK),)
 endif
 	$(Q) $(RMALL) $@.*
 
-RUBYSPEC_CAPIEXT_SO := $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c)))
-rubyspec-capiext: $(RUBYSPEC_CAPIEXT_SO)
-	@ $(NULLCMD)
+RUBYSPEC_CAPIEXT_EXTS := $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c)))
+rubyspec-capiext: $(RUBYSPEC_CAPIEXT_EXTS)
 
 spec/%/ spec/%_spec.rb: programs exts $(RUBYSPEC_CAPIEXT_BUILD) PHONY
 	+$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec-run -B $(srcdir)/spec/default.mspec $(SPECOPTS) $(patsubst %,$(srcdir)/%,$@)

dir.c

@@ -1586,23 +1586,29 @@ dir_chdir(VALUE dir)
 }
 
 #ifndef _WIN32
-VALUE
-rb_dir_getwd_ospath(void)
+static VALUE
+getcwd_to_str(VALUE arg)
 {
-    char *path;
-    VALUE cwd;
-    VALUE path_guard;
-
-    path_guard = rb_imemo_tmpbuf_new();
-    path = ruby_getcwd();
-    rb_imemo_tmpbuf_set_ptr(path_guard, path);
+    const char *path = (const char *)arg;
 #ifdef __APPLE__
-    cwd = rb_str_normalize_ospath(path, strlen(path));
+    return rb_str_normalize_ospath(path, strlen(path));
 #else
-    cwd = rb_str_new2(path);
+    return rb_str_new2(path);
 #endif
-    rb_free_tmp_buffer(&path_guard);
-    return cwd;
+}
+
+static VALUE
+getcwd_xfree(VALUE arg)
+{
+    xfree((void *)arg);
+    return Qnil;
+}
+
+VALUE
+rb_dir_getwd_ospath(void)
+{
+    char *path = ruby_getcwd();
+    return rb_ensure(getcwd_to_str, (VALUE)path, getcwd_xfree, (VALUE)path);
 }
 #endif
 

doc/maintainers.md

@@ -616,6 +616,12 @@ It may needs to make consensus on ruby-core/ruby-dev before making major changes
 * https://github.com/ruby/tsort
 * https://rubygems.org/gems/tsort
 
+#### win32-registry
+
+* Nakamura Usaku ([unak])
+* https://github.com/ruby/win32-registry
+* https://rubygems.org/gems/win32-registry
+
 ## Platform Maintainers
 
 ### mswin64 (Microsoft Windows)

doc/standard_library.md

@@ -124,6 +124,7 @@ of each.
 - [readline]: Wrapper for the Readline extension and Reline
 - [fiddle]: A libffi wrapper for Ruby
 - [tsort]: Topological sorting using Tarjan's algorithm
+- [win32-registry]: Registry accessor library for the Windows platform.
 
 ## Tools
 
@@ -208,6 +209,7 @@ of each.
 [uri]: https://github.com/ruby/uri
 [weakref]: https://github.com/ruby/weakref
 [win32ole]: https://github.com/ruby/win32ole
+[win32-registry]: https://github.com/ruby/win32-registry
 [yaml]: https://github.com/ruby/yaml
 [zlib]: https://github.com/ruby/zlib
 

ext/json/lib/json.rb

@@ -201,10 +201,10 @@
 # defaults to +false+.
 #
 # With the default, +false+:
-#   JSON.parse(%{"Hell\\o"}) # invalid escape character in string (JSON::ParserError)
+#   JSON.parse('"Hell\o"') # invalid escape character in string (JSON::ParserError)
 #
 # When enabled:
-#   JSON.parse(%{"Hell\\o"}, allow_invalid_escape: true) # => "Hello"
+#   JSON.parse('"Hell\o"', allow_invalid_escape: true) # => "Hello"
 #
 # ====== Output Options
 #