[pull] master from ruby:master

.github/workflows/zjit-macos.yml

@@ -98,7 +98,7 @@ jobs:
           rustup install ${{ matrix.rust_version }} --profile minimal
           rustup default ${{ matrix.rust_version }}
 
-      - uses: taiki-e/install-action@4684b8405694ae9dd42c9f39ba901a70ae83f4a3 # v2.82.9
+      - uses: taiki-e/install-action@50414676f9f5d50a65992c6dd2ed02641263226c # v2.82.10
         with:
           tool: nextest@0.9
         if: ${{ matrix.test_task == 'zjit-check' }}

.github/workflows/zjit-ubuntu.yml

@@ -141,7 +141,7 @@ jobs:
           ruby-version: '3.1'
           bundler: none
 
-      - uses: taiki-e/install-action@4684b8405694ae9dd42c9f39ba901a70ae83f4a3 # v2.82.9
+      - uses: taiki-e/install-action@50414676f9f5d50a65992c6dd2ed02641263226c # v2.82.10
         with:
           tool: nextest@0.9
         if: ${{ matrix.test_task == 'zjit-check' }}

array.c

@@ -902,7 +902,7 @@ init_fake_ary_flags(void)
     struct RArray fake_ary = {0};
     fake_ary.basic.flags = T_ARRAY;
     VALUE ary = (VALUE)&fake_ary;
-    RBASIC_SET_SHAPE_ID(ary, ROOT_SHAPE_ID | SHAPE_ID_LAYOUT_OTHER);
+    RBASIC_SET_FULL_SHAPE_ID(ary, ROOT_SHAPE_ID | SHAPE_ID_LAYOUT_OTHER);
     rb_ary_freeze(ary);
     return fake_ary.basic.flags;
 }

common.mk

@@ -698,7 +698,7 @@ clean-local:: clean-runnable
 	-$(Q)$(RMALL) dump_ast$(BUILD_EXEEXT)*
 	-$(Q)$(RMALL) target
 	-$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine target \
-	  $(PRISM_BUILD_DIR)/*/ $(PRISM_BUILD_DIR) tmp \
+	  $(PRISM_BUILD_DIR)/*/ $(PRISM_BUILD_DIR) gc/default gc tmp \
 	2> $(NULL) || $(NULLCMD)
 
 bin/clean-runnable:: PHONY

depend

@@ -3002,7 +3002,6 @@ debug_counter.$(OBJEXT): {$(VPATH)}internal/variable.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 debug_counter.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 debug_counter.$(OBJEXT): {$(VPATH)}missing.h
-debug_counter.$(OBJEXT): {$(VPATH)}onigmo.h
 debug_counter.$(OBJEXT): {$(VPATH)}st.h
 debug_counter.$(OBJEXT): {$(VPATH)}subst.h
 debug_counter.$(OBJEXT): {$(VPATH)}thread_native.h
@@ -3386,7 +3385,6 @@ dln.$(OBJEXT): {$(VPATH)}internal/variable.h
 dln.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 dln.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 dln.$(OBJEXT): {$(VPATH)}missing.h
-dln.$(OBJEXT): {$(VPATH)}onigmo.h
 dln.$(OBJEXT): {$(VPATH)}st.h
 dln.$(OBJEXT): {$(VPATH)}subst.h
 dln_find.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -3546,7 +3544,6 @@ dln_find.$(OBJEXT): {$(VPATH)}internal/variable.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 dln_find.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 dln_find.$(OBJEXT): {$(VPATH)}missing.h
-dln_find.$(OBJEXT): {$(VPATH)}onigmo.h
 dln_find.$(OBJEXT): {$(VPATH)}st.h
 dln_find.$(OBJEXT): {$(VPATH)}subst.h
 dmydln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -3705,7 +3702,6 @@ dmydln.$(OBJEXT): {$(VPATH)}internal/variable.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 dmydln.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 dmydln.$(OBJEXT): {$(VPATH)}missing.h
-dmydln.$(OBJEXT): {$(VPATH)}onigmo.h
 dmydln.$(OBJEXT): {$(VPATH)}st.h
 dmydln.$(OBJEXT): {$(VPATH)}subst.h
 dmyenc.$(OBJEXT): {$(VPATH)}dmyenc.c
@@ -5936,6 +5932,7 @@ gc.$(OBJEXT): $(hdrdir)/ruby.h
 gc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 gc.$(OBJEXT): $(hdrdir)/ruby/version.h
 gc.$(OBJEXT): $(top_srcdir)/gc/default/default.c
+gc.$(OBJEXT): $(top_srcdir)/gc/default/zjit_fastpath.h
 gc.$(OBJEXT): $(top_srcdir)/gc/gc.h
 gc.$(OBJEXT): $(top_srcdir)/gc/gc_impl.h
 gc.$(OBJEXT): $(top_srcdir)/internal/array.h
@@ -7107,7 +7104,6 @@ inits.$(OBJEXT): {$(VPATH)}internal/variable.h
 inits.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 inits.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 inits.$(OBJEXT): {$(VPATH)}missing.h
-inits.$(OBJEXT): {$(VPATH)}onigmo.h
 inits.$(OBJEXT): {$(VPATH)}prelude.rbinc
 inits.$(OBJEXT): {$(VPATH)}st.h
 inits.$(OBJEXT): {$(VPATH)}subst.h
@@ -8524,7 +8520,6 @@ loadpath.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 loadpath.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 loadpath.$(OBJEXT): {$(VPATH)}loadpath.c
 loadpath.$(OBJEXT): {$(VPATH)}missing.h
-loadpath.$(OBJEXT): {$(VPATH)}onigmo.h
 loadpath.$(OBJEXT): {$(VPATH)}st.h
 loadpath.$(OBJEXT): {$(VPATH)}subst.h
 loadpath.$(OBJEXT): {$(VPATH)}verconf.h
@@ -8862,7 +8857,6 @@ main.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 main.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 main.$(OBJEXT): {$(VPATH)}main.c
 main.$(OBJEXT): {$(VPATH)}missing.h
-main.$(OBJEXT): {$(VPATH)}onigmo.h
 main.$(OBJEXT): {$(VPATH)}st.h
 main.$(OBJEXT): {$(VPATH)}subst.h
 main.$(OBJEXT): {$(VPATH)}vm_debug.h
@@ -9269,7 +9263,6 @@ math.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 math.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 math.$(OBJEXT): {$(VPATH)}math.c
 math.$(OBJEXT): {$(VPATH)}missing.h
-math.$(OBJEXT): {$(VPATH)}onigmo.h
 math.$(OBJEXT): {$(VPATH)}shape.h
 math.$(OBJEXT): {$(VPATH)}st.h
 math.$(OBJEXT): {$(VPATH)}subst.h
@@ -16660,7 +16653,6 @@ setproctitle.$(OBJEXT): {$(VPATH)}internal/variable.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 setproctitle.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 setproctitle.$(OBJEXT): {$(VPATH)}missing.h
-setproctitle.$(OBJEXT): {$(VPATH)}onigmo.h
 setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c
 setproctitle.$(OBJEXT): {$(VPATH)}st.h
 setproctitle.$(OBJEXT): {$(VPATH)}subst.h
@@ -18650,6 +18642,8 @@ thread.$(OBJEXT): {$(VPATH)}onigmo.h
 thread.$(OBJEXT): {$(VPATH)}oniguruma.h
 thread.$(OBJEXT): {$(VPATH)}prism_compile.h
 thread.$(OBJEXT): {$(VPATH)}prism_xallocator.h
+thread.$(OBJEXT): {$(VPATH)}probes.dmyh
+thread.$(OBJEXT): {$(VPATH)}probes.h
 thread.$(OBJEXT): {$(VPATH)}ractor.h
 thread.$(OBJEXT): {$(VPATH)}ractor_core.h
 thread.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -19272,7 +19266,6 @@ util.$(OBJEXT): {$(VPATH)}internal/variable.h
 util.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 util.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 util.$(OBJEXT): {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}onigmo.h
 util.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 util.$(OBJEXT): {$(VPATH)}st.h
 util.$(OBJEXT): {$(VPATH)}subst.h
@@ -20719,6 +20712,8 @@ vm_sync.$(OBJEXT): {$(VPATH)}missing.h
 vm_sync.$(OBJEXT): {$(VPATH)}node.h
 vm_sync.$(OBJEXT): {$(VPATH)}onigmo.h
 vm_sync.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_sync.$(OBJEXT): {$(VPATH)}probes.dmyh
+vm_sync.$(OBJEXT): {$(VPATH)}probes.h
 vm_sync.$(OBJEXT): {$(VPATH)}ractor.h
 vm_sync.$(OBJEXT): {$(VPATH)}ractor_core.h
 vm_sync.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -21717,6 +21712,8 @@ zjit.$(OBJEXT): {$(VPATH)}prism_xallocator.h
 zjit.$(OBJEXT): {$(VPATH)}probes.dmyh
 zjit.$(OBJEXT): {$(VPATH)}probes.h
 zjit.$(OBJEXT): {$(VPATH)}probes_helper.h
+zjit.$(OBJEXT): {$(VPATH)}ractor.h
+zjit.$(OBJEXT): {$(VPATH)}ractor_core.h
 zjit.$(OBJEXT): {$(VPATH)}ruby_assert.h
 zjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 zjit.$(OBJEXT): {$(VPATH)}rubyparser.h

enc/depend

@@ -5243,7 +5243,6 @@ enc/trans/big5.$(OBJEXT): internal/variable.h
 enc/trans/big5.$(OBJEXT): internal/warning_push.h
 enc/trans/big5.$(OBJEXT): internal/xmalloc.h
 enc/trans/big5.$(OBJEXT): missing.h
-enc/trans/big5.$(OBJEXT): onigmo.h
 enc/trans/big5.$(OBJEXT): st.h
 enc/trans/big5.$(OBJEXT): subst.h
 enc/trans/cesu_8.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -5404,7 +5403,6 @@ enc/trans/cesu_8.$(OBJEXT): internal/variable.h
 enc/trans/cesu_8.$(OBJEXT): internal/warning_push.h
 enc/trans/cesu_8.$(OBJEXT): internal/xmalloc.h
 enc/trans/cesu_8.$(OBJEXT): missing.h
-enc/trans/cesu_8.$(OBJEXT): onigmo.h
 enc/trans/cesu_8.$(OBJEXT): st.h
 enc/trans/cesu_8.$(OBJEXT): subst.h
 enc/trans/chinese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -5565,7 +5563,6 @@ enc/trans/chinese.$(OBJEXT): internal/variable.h
 enc/trans/chinese.$(OBJEXT): internal/warning_push.h
 enc/trans/chinese.$(OBJEXT): internal/xmalloc.h
 enc/trans/chinese.$(OBJEXT): missing.h
-enc/trans/chinese.$(OBJEXT): onigmo.h
 enc/trans/chinese.$(OBJEXT): st.h
 enc/trans/chinese.$(OBJEXT): subst.h
 enc/trans/ebcdic.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -5726,7 +5723,6 @@ enc/trans/ebcdic.$(OBJEXT): internal/variable.h
 enc/trans/ebcdic.$(OBJEXT): internal/warning_push.h
 enc/trans/ebcdic.$(OBJEXT): internal/xmalloc.h
 enc/trans/ebcdic.$(OBJEXT): missing.h
-enc/trans/ebcdic.$(OBJEXT): onigmo.h
 enc/trans/ebcdic.$(OBJEXT): st.h
 enc/trans/ebcdic.$(OBJEXT): subst.h
 enc/trans/emoji.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -5887,7 +5883,6 @@ enc/trans/emoji.$(OBJEXT): internal/variable.h
 enc/trans/emoji.$(OBJEXT): internal/warning_push.h
 enc/trans/emoji.$(OBJEXT): internal/xmalloc.h
 enc/trans/emoji.$(OBJEXT): missing.h
-enc/trans/emoji.$(OBJEXT): onigmo.h
 enc/trans/emoji.$(OBJEXT): st.h
 enc/trans/emoji.$(OBJEXT): subst.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -6048,7 +6043,6 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/variable.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/warning_push.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/xmalloc.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): missing.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): onigmo.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): st.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): subst.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -6209,7 +6203,6 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/variable.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/warning_push.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/xmalloc.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): missing.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): onigmo.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): st.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): subst.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -6370,7 +6363,6 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/variable.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/warning_push.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/xmalloc.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): missing.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): onigmo.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): st.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): subst.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -6531,7 +6523,6 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/variable.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/warning_push.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/xmalloc.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): missing.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): onigmo.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): st.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): subst.h
 enc/trans/escape.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -6692,7 +6683,6 @@ enc/trans/escape.$(OBJEXT): internal/variable.h
 enc/trans/escape.$(OBJEXT): internal/warning_push.h
 enc/trans/escape.$(OBJEXT): internal/xmalloc.h
 enc/trans/escape.$(OBJEXT): missing.h
-enc/trans/escape.$(OBJEXT): onigmo.h
 enc/trans/escape.$(OBJEXT): st.h
 enc/trans/escape.$(OBJEXT): subst.h
 enc/trans/gb18030.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -6853,7 +6843,6 @@ enc/trans/gb18030.$(OBJEXT): internal/variable.h
 enc/trans/gb18030.$(OBJEXT): internal/warning_push.h
 enc/trans/gb18030.$(OBJEXT): internal/xmalloc.h
 enc/trans/gb18030.$(OBJEXT): missing.h
-enc/trans/gb18030.$(OBJEXT): onigmo.h
 enc/trans/gb18030.$(OBJEXT): st.h
 enc/trans/gb18030.$(OBJEXT): subst.h
 enc/trans/gbk.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7014,7 +7003,6 @@ enc/trans/gbk.$(OBJEXT): internal/variable.h
 enc/trans/gbk.$(OBJEXT): internal/warning_push.h
 enc/trans/gbk.$(OBJEXT): internal/xmalloc.h
 enc/trans/gbk.$(OBJEXT): missing.h
-enc/trans/gbk.$(OBJEXT): onigmo.h
 enc/trans/gbk.$(OBJEXT): st.h
 enc/trans/gbk.$(OBJEXT): subst.h
 enc/trans/iso2022.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7176,7 +7164,6 @@ enc/trans/iso2022.$(OBJEXT): internal/variable.h
 enc/trans/iso2022.$(OBJEXT): internal/warning_push.h
 enc/trans/iso2022.$(OBJEXT): internal/xmalloc.h
 enc/trans/iso2022.$(OBJEXT): missing.h
-enc/trans/iso2022.$(OBJEXT): onigmo.h
 enc/trans/iso2022.$(OBJEXT): st.h
 enc/trans/iso2022.$(OBJEXT): subst.h
 enc/trans/japanese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7337,7 +7324,6 @@ enc/trans/japanese.$(OBJEXT): internal/variable.h
 enc/trans/japanese.$(OBJEXT): internal/warning_push.h
 enc/trans/japanese.$(OBJEXT): internal/xmalloc.h
 enc/trans/japanese.$(OBJEXT): missing.h
-enc/trans/japanese.$(OBJEXT): onigmo.h
 enc/trans/japanese.$(OBJEXT): st.h
 enc/trans/japanese.$(OBJEXT): subst.h
 enc/trans/japanese_euc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7498,7 +7484,6 @@ enc/trans/japanese_euc.$(OBJEXT): internal/variable.h
 enc/trans/japanese_euc.$(OBJEXT): internal/warning_push.h
 enc/trans/japanese_euc.$(OBJEXT): internal/xmalloc.h
 enc/trans/japanese_euc.$(OBJEXT): missing.h
-enc/trans/japanese_euc.$(OBJEXT): onigmo.h
 enc/trans/japanese_euc.$(OBJEXT): st.h
 enc/trans/japanese_euc.$(OBJEXT): subst.h
 enc/trans/japanese_sjis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7659,7 +7644,6 @@ enc/trans/japanese_sjis.$(OBJEXT): internal/variable.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/warning_push.h
 enc/trans/japanese_sjis.$(OBJEXT): internal/xmalloc.h
 enc/trans/japanese_sjis.$(OBJEXT): missing.h
-enc/trans/japanese_sjis.$(OBJEXT): onigmo.h
 enc/trans/japanese_sjis.$(OBJEXT): st.h
 enc/trans/japanese_sjis.$(OBJEXT): subst.h
 enc/trans/korean.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7820,7 +7804,6 @@ enc/trans/korean.$(OBJEXT): internal/variable.h
 enc/trans/korean.$(OBJEXT): internal/warning_push.h
 enc/trans/korean.$(OBJEXT): internal/xmalloc.h
 enc/trans/korean.$(OBJEXT): missing.h
-enc/trans/korean.$(OBJEXT): onigmo.h
 enc/trans/korean.$(OBJEXT): st.h
 enc/trans/korean.$(OBJEXT): subst.h
 enc/trans/newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -7980,7 +7963,6 @@ enc/trans/newline.$(OBJEXT): internal/variable.h
 enc/trans/newline.$(OBJEXT): internal/warning_push.h
 enc/trans/newline.$(OBJEXT): internal/xmalloc.h
 enc/trans/newline.$(OBJEXT): missing.h
-enc/trans/newline.$(OBJEXT): onigmo.h
 enc/trans/newline.$(OBJEXT): st.h
 enc/trans/newline.$(OBJEXT): subst.h
 enc/trans/single_byte.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -8141,7 +8123,6 @@ enc/trans/single_byte.$(OBJEXT): internal/variable.h
 enc/trans/single_byte.$(OBJEXT): internal/warning_push.h
 enc/trans/single_byte.$(OBJEXT): internal/xmalloc.h
 enc/trans/single_byte.$(OBJEXT): missing.h
-enc/trans/single_byte.$(OBJEXT): onigmo.h
 enc/trans/single_byte.$(OBJEXT): st.h
 enc/trans/single_byte.$(OBJEXT): subst.h
 enc/trans/transdb.$(OBJEXT): $(hdrdir)/ruby.h
@@ -8302,7 +8283,6 @@ enc/trans/transdb.$(OBJEXT): internal/variable.h
 enc/trans/transdb.$(OBJEXT): internal/warning_push.h
 enc/trans/transdb.$(OBJEXT): internal/xmalloc.h
 enc/trans/transdb.$(OBJEXT): missing.h
-enc/trans/transdb.$(OBJEXT): onigmo.h
 enc/trans/transdb.$(OBJEXT): st.h
 enc/trans/transdb.$(OBJEXT): subst.h
 enc/trans/transdb.$(OBJEXT): transdb.h
@@ -8464,7 +8444,6 @@ enc/trans/utf8_mac.$(OBJEXT): internal/variable.h
 enc/trans/utf8_mac.$(OBJEXT): internal/warning_push.h
 enc/trans/utf8_mac.$(OBJEXT): internal/xmalloc.h
 enc/trans/utf8_mac.$(OBJEXT): missing.h
-enc/trans/utf8_mac.$(OBJEXT): onigmo.h
 enc/trans/utf8_mac.$(OBJEXT): st.h
 enc/trans/utf8_mac.$(OBJEXT): subst.h
 enc/trans/utf_16_32.$(OBJEXT): $(hdrdir)/ruby/ruby.h
@@ -8625,7 +8604,6 @@ enc/trans/utf_16_32.$(OBJEXT): internal/variable.h
 enc/trans/utf_16_32.$(OBJEXT): internal/warning_push.h
 enc/trans/utf_16_32.$(OBJEXT): internal/xmalloc.h
 enc/trans/utf_16_32.$(OBJEXT): missing.h
-enc/trans/utf_16_32.$(OBJEXT): onigmo.h
 enc/trans/utf_16_32.$(OBJEXT): st.h
 enc/trans/utf_16_32.$(OBJEXT): subst.h
 enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/casefold.h

ext/-test-/RUBY_ALIGNOF/depend

@@ -156,7 +156,6 @@ c.o: $(hdrdir)/ruby/internal/variable.h
 c.o: $(hdrdir)/ruby/internal/warning_push.h
 c.o: $(hdrdir)/ruby/internal/xmalloc.h
 c.o: $(hdrdir)/ruby/missing.h
-c.o: $(hdrdir)/ruby/onigmo.h
 c.o: $(hdrdir)/ruby/ruby.h
 c.o: $(hdrdir)/ruby/st.h
 c.o: $(hdrdir)/ruby/subst.h

ext/-test-/arith_seq/beg_len_step/depend

@@ -155,7 +155,6 @@ beg_len_step.o: $(hdrdir)/ruby/internal/variable.h
 beg_len_step.o: $(hdrdir)/ruby/internal/warning_push.h
 beg_len_step.o: $(hdrdir)/ruby/internal/xmalloc.h
 beg_len_step.o: $(hdrdir)/ruby/missing.h
-beg_len_step.o: $(hdrdir)/ruby/onigmo.h
 beg_len_step.o: $(hdrdir)/ruby/ruby.h
 beg_len_step.o: $(hdrdir)/ruby/st.h
 beg_len_step.o: $(hdrdir)/ruby/subst.h

ext/-test-/arith_seq/extract/depend

@@ -155,7 +155,6 @@ extract.o: $(hdrdir)/ruby/internal/variable.h
 extract.o: $(hdrdir)/ruby/internal/warning_push.h
 extract.o: $(hdrdir)/ruby/internal/xmalloc.h
 extract.o: $(hdrdir)/ruby/missing.h
-extract.o: $(hdrdir)/ruby/onigmo.h
 extract.o: $(hdrdir)/ruby/ruby.h
 extract.o: $(hdrdir)/ruby/st.h
 extract.o: $(hdrdir)/ruby/subst.h

ext/-test-/array/concat/depend

@@ -156,7 +156,6 @@ to_ary_concat.o: $(hdrdir)/ruby/internal/variable.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/warning_push.h
 to_ary_concat.o: $(hdrdir)/ruby/internal/xmalloc.h
 to_ary_concat.o: $(hdrdir)/ruby/missing.h
-to_ary_concat.o: $(hdrdir)/ruby/onigmo.h
 to_ary_concat.o: $(hdrdir)/ruby/ruby.h
 to_ary_concat.o: $(hdrdir)/ruby/st.h
 to_ary_concat.o: $(hdrdir)/ruby/subst.h

ext/-test-/array/resize/depend

@@ -155,7 +155,6 @@ resize.o: $(hdrdir)/ruby/internal/variable.h
 resize.o: $(hdrdir)/ruby/internal/warning_push.h
 resize.o: $(hdrdir)/ruby/internal/xmalloc.h
 resize.o: $(hdrdir)/ruby/missing.h
-resize.o: $(hdrdir)/ruby/onigmo.h
 resize.o: $(hdrdir)/ruby/ruby.h
 resize.o: $(hdrdir)/ruby/st.h
 resize.o: $(hdrdir)/ruby/subst.h