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

Get rid of gen_fields_tbl.fields_count

Browse Source 
This data is redundant because the shape already contains both the
length and capacity of the object's fields.

So it both waste space and create the possibility of a desync between
the two.

We also do not need to initialize everything to Qundef, this seem
to be a left-over from pre-shape instance variables.
This commit is contained in:
Jean Boussier 2025-06-09 10:37:28 +02:00
parent e210a70e9a
commit f9966b9b76
Notes: git 2025-06-09 14:38:44 +00:00 
Merged: https://github.com/ruby/ruby/pull/13561
4 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gc.c
View File

@ -4093,7 +4093,8 @@ vm_weak_table_gen_fields_foreach(st_data_t key, st_data_t value, st_data_t data)
);
}
else {
for (uint32_t i = 0; i < fields_tbl->as.shape.fields_count; i++) {
uint32_t fields_count = RSHAPE_LEN(RBASIC_SHAPE_ID((VALUE)key));
for (uint32_t i = 0; i < fields_count; i++) {
if (SPECIAL_CONST_P(fields_tbl->as.shape.fields[i])) continue;
int ivar_ret = iter_data->callback(fields_tbl->as.shape.fields[i], iter_data->data);

5
ractor.c
View File

@ -1658,13 +1658,12 @@ obj_traverse_replace_i(VALUE obj, struct obj_traverse_replace_data *data)
if (d.stop) return 1;
}
else {
for (uint32_t i = 0; i < fields_tbl->as.shape.fields_count; i++) {
if (!UNDEF_P(fields_tbl->as.shape.fields[i])) {
uint32_t fields_count = RSHAPE_LEN(RBASIC_SHAPE_ID(obj));
for (uint32_t i = 0; i < fields_count; i++) {
CHECK_AND_REPLACE(fields_tbl->as.shape.fields[i]);
}
}
}
}
switch (BUILTIN_TYPE(obj)) {
// no child node

33
variable.c
View File

@ -1228,19 +1228,10 @@ gen_fields_tbl_bytes(size_t n)
}
static struct gen_fields_tbl *
gen_fields_tbl_resize(struct gen_fields_tbl *old, uint32_t n)
gen_fields_tbl_resize(struct gen_fields_tbl *old, uint32_t new_capa)
{
RUBY_ASSERT(n > 0);
uint32_t len = old ? old->as.shape.fields_count : 0;
struct gen_fields_tbl *fields_tbl = xrealloc(old, gen_fields_tbl_bytes(n));
fields_tbl->as.shape.fields_count = n;
for (; len < n; len++) {
fields_tbl->as.shape.fields[len] = Qundef;
}
return fields_tbl;
RUBY_ASSERT(new_capa > 0);
return xrealloc(old, gen_fields_tbl_bytes(new_capa));
}
void
@ -1253,7 +1244,8 @@ rb_mark_generic_ivar(VALUE obj)
rb_mark_tbl_no_pin(fields_tbl->as.complex.table);
}
else {
for (uint32_t i = 0; i < fields_tbl->as.shape.fields_count; i++) {
uint32_t fields_count = RSHAPE_LEN(RBASIC_SHAPE_ID(obj));
for (uint32_t i = 0; i < fields_count; i++) {
rb_gc_mark_movable(fields_tbl->as.shape.fields[i]);
}
}
@ -1290,7 +1282,7 @@ rb_generic_ivar_memsize(VALUE obj)
return sizeof(struct gen_fields_tbl) + st_memsize(fields_tbl->as.complex.table);
}
else {
return gen_fields_tbl_bytes(fields_tbl->as.shape.fields_count);
return gen_fields_tbl_bytes(RSHAPE_CAPACITY(RBASIC_SHAPE_ID(obj)));
}
}
return 0;
@ -1299,21 +1291,12 @@ rb_generic_ivar_memsize(VALUE obj)
static size_t
gen_fields_tbl_count(VALUE obj, const struct gen_fields_tbl *fields_tbl)
{
uint32_t i;
size_t n = 0;
if (rb_shape_obj_too_complex_p(obj)) {
n = st_table_size(fields_tbl->as.complex.table);
return st_table_size(fields_tbl->as.complex.table);
}
else {
for (i = 0; i < fields_tbl->as.shape.fields_count; i++) {
if (!UNDEF_P(fields_tbl->as.shape.fields[i])) {
n++;
return RSHAPE_LEN(RBASIC_SHAPE_ID(obj));
}
}
}
return n;
}
VALUE

1
variable.h
View File

@ -15,7 +15,6 @@
struct gen_fields_tbl {
union {
struct {
uint32_t fields_count;
VALUE fields[1];
} shape;
struct {