Skip to content

[pull] master from ruby:master #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 13 commits into from
Jun 19, 2026
Merged

[pull] master from ruby:master #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4ad44e5
[ruby/json] Update the json_minefield_parser_test.rb to remove JRUBY_…
samyron Jun 19, 2026
57d5247
[ruby/mmtk] Call rb_memerror when OOM
peterzhu2118 Jun 19, 2026
ebd2fcf
Test ASCII-8BIT case mapping byte parity
FletcherDares Jun 18, 2026
51d4ad5
Fast path ASCII-8BIT case mapping
FletcherDares Jun 18, 2026
73cd91b
[ruby/json] Implement ResumableParser#parsed_bytes
byroot Jun 19, 2026
46128b1
[ruby/json] ResumableParser: Don't compute lines and columns on parse…
byroot Jun 19, 2026
c88430e
Fix ar_find_entry_hint() to handle #eql? or another thread changing b…
eregon Jun 17, 2026
fe5ec34
Refactor DO_PTR_EQUAL_CHECK to read entry fields once into locals
eregon Jun 18, 2026
4be75d8
Avoid `-C` with miniruby
nobu Jun 19, 2026
ca7a90c
[ruby/json] Don't omit `test_parse_error_snippet` on TruffleRuby
byroot Jun 19, 2026
70abf87
[ruby/json] ResumableParser: use throw rather than raise for handled EOS
byroot Jun 19, 2026
b6bcd73
[ruby/json] Workaround TruffleRuby buggy `rb_catch_obj` implementation
byroot Jun 19, 2026
a7022d3
[ruby/json] ResumableParser: accept only keyword arguments
byroot Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions benchmark/string_downcase.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ prelude: |
nonascii10 = nonascii1 * 10
nonascii100 = nonascii10 * 10
nonascii1000 = nonascii100 * 10
ascii8bit256 = (0..255).to_a.pack("C*")
ascii8bit2560 = ascii8bit256 * 10
ascii8bit25600 = ascii8bit2560 * 10
ascii8bit256000 = ascii8bit25600 * 10
benchmark:
downcase-1: str1.upcase
downcase-10: str10.upcase
Expand All @@ -16,3 +20,7 @@ benchmark:
downcase-nonascii10: nonascii10.downcase
downcase-nonascii100: nonascii100.downcase
downcase-nonascii1000: nonascii1000.downcase
downcase-ascii8bit-256: ascii8bit256.downcase
downcase-ascii8bit-2560: ascii8bit2560.downcase
downcase-ascii8bit-25600: ascii8bit25600.downcase
downcase-ascii8bit-256000: ascii8bit256000.downcase
8 changes: 8 additions & 0 deletions benchmark/string_upcase.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ prelude: |
nonascii10 = nonascii1 * 10
nonascii100 = nonascii10 * 10
nonascii1000 = nonascii100 * 10
ascii8bit256 = (0..255).to_a.pack("C*")
ascii8bit2560 = ascii8bit256 * 10
ascii8bit25600 = ascii8bit2560 * 10
ascii8bit256000 = ascii8bit25600 * 10
benchmark:
upcase-1: str1.upcase
upcase-10: str10.upcase
Expand All @@ -16,3 +20,7 @@ benchmark:
upcase-nonascii10: nonascii10.upcase
upcase-nonascii100: nonascii100.upcase
upcase-nonascii1000: nonascii1000.upcase
upcase-ascii8bit-256: ascii8bit256.upcase
upcase-ascii8bit-2560: ascii8bit2560.upcase
upcase-ascii8bit-25600: ascii8bit25600.upcase
upcase-ascii8bit-256000: ascii8bit256000.upcase
4 changes: 2 additions & 2 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,10 +1585,10 @@ no-test-bundled-gems-precheck:
yes-update-default-gemspecs no-update-default-gemspecs: update-default-gemspecs
update-default-gemspecs: $(PREP) $(RBCONFIG)
@$(MAKEDIRS) $(srcdir)/.bundle/specifications
$(Q)$(MINIRUBY) -W0 -C "$(srcdir)" -I tool/lib -roptparse -routput -rbundled_gem \
$(Q)$(MINIRUBY) -W0 -I "$(srcdir)/tool/lib" -roptparse -routput -rbundled_gem \
-e "(out = Output.new).def_options(ARGV.options)" \
-e "BundledGem.update_default_gemspecs(ARGV.parse!, out, quiet: $(V).zero?)" \
-- -c -o .bundle/specifications lib ext
-- -c -o "$(srcdir)/.bundle/specifications" "$(srcdir)/lib" "$(srcdir)/ext"

install-for-test-bundled-gems: $(TEST_RUNNABLE)-install-for-test-bundled-gems
no-install-for-test-bundled-gems: no-update-default-gemspecs
Expand Down
2 changes: 2 additions & 0 deletions ext/json/parser/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
require 'mkmf'

$defs << "-DJSON_DEBUG" if ENV.fetch("JSON_DEBUG", "0") != "0"
$defs << "-DJSON_WORKAROUND_RB_CATCH_BUG" if RUBY_ENGINE == 'truffleruby'

have_func("rb_enc_interned_str", "ruby/encoding.h") # RUBY_VERSION >= 3.0
have_func("rb_str_to_interned_str", "ruby.h") # RUBY_VERSION >= 3.0
have_func("rb_hash_new_capa", "ruby.h") # RUBY_VERSION >= 3.2
Expand Down
Loading