Skip to content

[pull] master from ruby:master #206

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 3 commits into from
Aug 26, 2025
Merged

[pull] master from ruby:master #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e31750a
Revert "Omit extra allocation of Array object in Windows platform tem…
eregon Aug 25, 2025
cc3f149
Fix ObjectSpace.count_objects to allocate all symbols it uses eagerly
eregon Aug 25, 2025
b2e940a
Simplified assertion
hsbt Aug 26, 2025
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: 6 additions & 2 deletions gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,6 +2490,10 @@ count_objects(int argc, VALUE *argv, VALUE os)
types[i] = type_sym(i);
}

// Same as type_sym, we need to create all key symbols in advance
VALUE total = ID2SYM(rb_intern("TOTAL"));
VALUE free = ID2SYM(rb_intern("FREE"));

rb_gc_impl_each_object(rb_gc_get_objspace(), count_objects_i, &data);

if (NIL_P(hash)) {
Expand All @@ -2498,8 +2502,8 @@ count_objects(int argc, VALUE *argv, VALUE os)
else if (!RHASH_EMPTY_P(hash)) {
rb_hash_stlike_foreach(hash, set_zero, hash);
}
rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(data.total));
rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(data.freed));
rb_hash_aset(hash, total, SIZET2NUM(data.total));
rb_hash_aset(hash, free, SIZET2NUM(data.freed));

for (size_t i = 0; i <= T_MASK; i++) {
if (data.counts[i]) {
Expand Down
11 changes: 2 additions & 9 deletions test/ruby/test_allocation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,7 @@ def self.num_allocations
RB

if num_arrays != $allocations[0]
if $allocations[0] - num_arrays == 1 && RUBY_PLATFORM =~ /mswin|mingw/
# TODO: Must fix this condition
# Windows platforms may allocate an extra array after https://github.com/ruby/ruby/pull/14303
else
failures << "Expected \#{num_arrays} array allocations for \#{check_code.inspect}, but \#{$allocations[0]} arrays allocated"
end
failures << "Expected \#{num_arrays} array allocations for \#{check_code.inspect}, but \#{$allocations[0]} arrays allocated"
end
if num_hashes != $allocations[1]
failures << "Expected \#{num_hashes} hash allocations for \#{check_code.inspect}, but \#{$allocations[1]} hashes allocated"
Expand All @@ -71,9 +66,7 @@ def self.num_allocations

#{checks}

unless failures.empty?
assert_equal(true, false, failures.join("\n"))
end
assert_empty(failures)
RUBY
end

Expand Down