1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix reference updating for id2ref table

Browse Source 
The id2ref table could contain dead entries which should not be passed
into rb_gc_location. Also, we already update references in gc_update_references
using rb_gc_vm_weak_table_foreach so we do not need to update it again.
This commit is contained in:
Peter Zhu 2025-05-26 15:05:02 -04:00 committed by Jean Boussier
parent 061d36476f
commit be5450467b
Notes: git 2025-05-27 06:22:39 +00:00 
Merged: https://github.com/ruby/ruby/pull/13444
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gc.c
View File

@ -1848,19 +1848,6 @@ id2ref_tbl_memsize(const void *data)
return rb_st_memsize(data); return rb_st_memsize(data);
} }
static void
id2ref_tbl_compact(void *data)
{
st_table *table = (st_table *)data;
if (LIKELY(RB_POSFIXABLE(LAST_OBJECT_ID()))) {
// We know keys are all FIXNUM, so no need to update them.
gc_ref_update_table_values_only(table);
}
else {
gc_update_table_refs(table);
}
}
static void static void
id2ref_tbl_free(void *data) id2ref_tbl_free(void *data)
{ {
@ -1875,7 +1862,8 @@ static const rb_data_type_t id2ref_tbl_type = {
.dmark = id2ref_tbl_mark, .dmark = id2ref_tbl_mark,
.dfree = id2ref_tbl_free, .dfree = id2ref_tbl_free,
.dsize = id2ref_tbl_memsize, .dsize = id2ref_tbl_memsize,
.dcompact = id2ref_tbl_compact, // dcompact function not required because the table is reference updated
// in rb_gc_vm_weak_table_foreach
}, },
.flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY .flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
}; };