Skip to content

[pull] master from ruby:master #888

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 2 commits into from
Mar 26, 2026
Merged

[pull] master from ruby:master #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a08bb7
Fix crash reporter NULL dereference with ractors (#16561)
k0kubun Mar 26, 2026
afe5f77
[ruby/json] Keep Integer#to_json optimized and adapt the test
eregon Mar 26, 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
10 changes: 7 additions & 3 deletions test/json/json_generator_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,10 +504,14 @@ def to_s
end
alias_method :to_s, :to_s
end
case RUBY_PLATFORM
when "java"
case RUBY_ENGINE
when "jruby"
assert_equal bignum_to_s, JSON.generate(bignum)
else
when "truffleruby"
assert_raise(NoMethodError) do
JSON.generate(bignum)
end
when "ruby"
assert_raise(TypeError) do
JSON.generate(bignum)
end
Expand Down
7 changes: 5 additions & 2 deletions vm_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,8 +1435,11 @@ rb_vm_bugreport(const void *ctx, FILE *errout)
kprintf("-- Threading information "
"---------------------------------------------------\n");
kprintf("Total ractor count: %u\n", vm->ractor.cnt);
kprintf("Ruby thread count for this ractor: %u\n", rb_ec_ractor_ptr(ec)->threads.cnt);
if (ec->thread_ptr->scheduler != Qnil) {
const rb_ractor_t *cr = rb_ec_ractor_ptr(ec);
if (cr) {
kprintf("Ruby thread count for this ractor: %u\n", cr->threads.cnt);
}
if (ec->thread_ptr && ec->thread_ptr->scheduler != Qnil) {
kprintf("Note that the Fiber scheduler is enabled\n");
}
kputs("\n");
Expand Down