Merge remote-tracking branch 'gh/master' into zjit-polymorphic-getivar

Author: XrXr

.github/workflows/check_misc.yml

@@ -22,6 +22,10 @@ jobs:
         with:
           token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
 
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: head
+
       - uses: ./.github/actions/setup/directories
         with:
           makeup: true
@@ -78,6 +82,11 @@ jobs:
           fi
         continue-on-error: ${{ steps.now.outputs.mon < 12 }}
 
+      - name: Check if date in man pages is up-to-date
+        run: |
+          make V=1 GIT=git BASERUBY=ruby update-man-date
+          git diff --color --no-ext-diff --ignore-submodules --exit-code -- man
+
       - name: Check if to generate documents
         id: rdoc
         run: |
@@ -111,7 +120,7 @@ jobs:
       - name: Generate docs
         id: docs
         run: |
-          make XRUBY=ruby RDOC_DEPENDS= RBCONFIG=update-rbconfig html
+          make XRUBY=ruby RDOC_DEPENDS= RBCONFIG=update-rbconfig HTMLOUT=html html
           echo htmlout=ruby-html-${GITHUB_SHA:0:10} >> $GITHUB_OUTPUT
         # Generate only when document commit/PR
         if: >-

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
@@ -1894,7 +1897,7 @@ sudo-precheck: PHONY
 	@$(SUDO) echo > $(NULL)
 
 update-man-date: PHONY
-	-$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs -i -p \
+	$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs -i -p \
 	-e 'BEGIN{@vcs=VCS.detect(ARGV.shift)}' \
 	-e '$$_.sub!(/^(\.Dd ).*/){$$1+@vcs.modified(ARGF.path).strftime("%B %d, %Y")}' \
 	"$(srcdir)" "$(srcdir)"/man/*.1

configure.ac

@@ -4342,9 +4342,6 @@ AS_IF([test -n "${LIBS}"], [
     MAINFLAGS=`echo " $MAINLIBS " | sed "s|$libspat"'||;s/^ *//;s/ *$//'`
 ])
 LIBRUBYARG_STATIC="${LIBRUBYARG_STATIC} \$(MAINLIBS)"
-AS_IF([test "$enable_shared" = yes], [
-    LIBRUBYARG_SHARED="${LIBRUBYARG_SHARED} \$(MAINLIBS)"
-])
 CPPFLAGS="$CPPFLAGS "'$(DEFS) ${cppflags}'
 AS_IF([test -n "${cflags+set}"], [
     cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`

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
 

dln.c

@@ -77,6 +77,10 @@ void *xrealloc();
 # include <unistd.h>
 #endif
 
+#ifndef UNREACHABLE_RETURN
+# define UNREACHABLE_RETURN(x) return (x)
+#endif
+
 #ifndef dln_loaderror
 static void
 dln_loaderror(const char *format, ...)
@@ -348,6 +352,7 @@ dln_open(const char *file)
     void *handle;
 
 #if defined(_WIN32)
+# define DLN_DEFINED
     char message[1024];
 
     /* Convert the file path to wide char */
@@ -374,6 +379,7 @@ dln_open(const char *file)
 # endif
 
 #elif defined(USE_DLN_DLOPEN)
+# define DLN_DEFINED
 
 # ifndef RTLD_LAZY
 #  define RTLD_LAZY 1
@@ -505,7 +511,7 @@ abi_check_enabled_p(void)
 static void *
 dln_load_and_init(const char *file, const char *init_fct_name)
 {
-#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
+#if defined(DLN_DEFINED)
     void *handle = dln_open(file);
 
 #ifdef RUBY_DLN_CHECK_ABI
@@ -523,6 +529,7 @@ dln_load_and_init(const char *file, const char *init_fct_name)
     return handle;
 
 #elif defined(_AIX)
+# define DLN_DEFINED
     {
         void (*init_fct)(void);
 
@@ -539,33 +546,25 @@ dln_load_and_init(const char *file, const char *init_fct_name)
     }
 #else
     dln_notimplement();
+    UNREACHABLE_RETURN(0);
 #endif
-
-    return 0;			/* dummy return */
 }
 
 void *
 dln_load(const char *file)
 {
-#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
-    char *init_fct_name;
-    init_funcname(&init_fct_name, file);
-    return dln_load_and_init(file, init_fct_name);
-#else
-    dln_notimplement();
-    return 0;
-#endif
+    return dln_load_feature(file, file);
 }
 
 void *
 dln_load_feature(const char *file, const char *fname)
 {
-#if defined(_WIN32) || defined(USE_DLN_DLOPEN)
+#if defined(DLN_DEFINED)
     char *init_fct_name;
     init_funcname(&init_fct_name, fname);
     return dln_load_and_init(file, init_fct_name);
 #else
     dln_notimplement();
-    return 0;
+    UNREACHABLE_RETURN(0);
 #endif
 }

doc/float.rb

@@ -51,7 +51,7 @@
 # See:
 #
 # - https://docs.oracle.com/cd/E19957-01/806-3568/ncg_goldberg.html
-# - https://github.com/rdp/ruby_tutorials_core/wiki/Ruby-Talk-FAQ#-why-are-rubys-floats-imprecise
+# - https://github.com/rdp/ruby_tutorials_core/wiki/Ruby-Talk-FAQ#user-content--why-are-rubys-floats-imprecise
 # - https://en.wikipedia.org/wiki/Floating_point#Accuracy_problems
 #
 # Note that precise storage and computation of rational numbers

doc/jit/yjit.md

@@ -94,7 +94,7 @@ cd yjit
 The YJIT `ruby` binary can be built with either GCC or Clang.
 It can be built either in dev (debug) mode or in release mode.
 For maximum performance, compile YJIT in release mode with GCC.
-See [Building Ruby](../contributing/building_ruby.md#building-ruby).
+See [Building Ruby](rdoc-ref:contributing/building_ruby.md@building-ruby).
 
 ```sh
 # Configure in release mode for maximum performance, build and install