archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

imemo_fields: store owner object in RBasic.klass

Browse source 
It is much more convenient than storing the klass, especially
when dealing with `object_id` as it allows to update the id2ref
table without having to dereference the owner, which may be
garbage at that point.
This commit is contained in:
Jean Boussier 2025-08-08 11:41:02 +02:00
parent ad12db4b3d
commit 10aa4134d4
7 changed files with 62 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gc.c
View file

@ -1921,7 +1921,7 @@ object_id(VALUE obj)
// in fields. // in fields.
return class_object_id(obj); return class_object_id(obj);
case T_IMEMO: case T_IMEMO:
rb_bug("T_IMEMO can't have an object_id"); RUBY_ASSERT(IMEMO_TYPE_P(obj, imemo_fields));
break; break;
default: default:
break; break;
@ -1945,20 +1945,26 @@ build_id2ref_i(VALUE obj, void *data)
switch (BUILTIN_TYPE(obj)) { switch (BUILTIN_TYPE(obj)) {
case T_CLASS: case T_CLASS:
case T_MODULE: case T_MODULE:
RUBY_ASSERT(!rb_objspace_garbage_object_p(obj));
if (RCLASS(obj)->object_id) { if (RCLASS(obj)->object_id) {
RUBY_ASSERT(!rb_objspace_garbage_object_p(obj));
st_insert(id2ref_tbl, RCLASS(obj)->object_id, obj); st_insert(id2ref_tbl, RCLASS(obj)->object_id, obj);
} }
break; break;
case T_IMEMO: case T_IMEMO:
case T_NONE: RUBY_ASSERT(!rb_objspace_garbage_object_p(obj));
if (IMEMO_TYPE_P(obj, imemo_fields) && rb_shape_obj_has_id(obj)) {
st_insert(id2ref_tbl, rb_obj_id(obj), rb_imemo_fields_owner(obj));
}
break; break;
default: case T_OBJECT:
RUBY_ASSERT(!rb_objspace_garbage_object_p(obj));
if (rb_shape_obj_has_id(obj)) { if (rb_shape_obj_has_id(obj)) {
RUBY_ASSERT(!rb_objspace_garbage_object_p(obj));
st_insert(id2ref_tbl, rb_obj_id(obj), obj); st_insert(id2ref_tbl, rb_obj_id(obj), obj);
} }
break; break;
default:
// For generic_fields, the T_IMEMO/fields is responsible for populating the entry.
break;
} }
} }

26
imemo.c
View file

@ -109,16 +109,16 @@ rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt)
} }
static VALUE static VALUE
imemo_fields_new(VALUE klass, size_t capa) imemo_fields_new(VALUE owner, size_t capa)
{ {
size_t embedded_size = offsetof(struct rb_fields, as.embed) + capa * sizeof(VALUE); size_t embedded_size = offsetof(struct rb_fields, as.embed) + capa * sizeof(VALUE);
if (rb_gc_size_allocatable_p(embedded_size)) { if (rb_gc_size_allocatable_p(embedded_size)) {
VALUE fields = rb_imemo_new(imemo_fields, klass, embedded_size); VALUE fields = rb_imemo_new(imemo_fields, owner, embedded_size);
RUBY_ASSERT(IMEMO_TYPE_P(fields, imemo_fields)); RUBY_ASSERT(IMEMO_TYPE_P(fields, imemo_fields));
return fields; return fields;
} }
else { else {
VALUE fields = rb_imemo_new(imemo_fields, klass, sizeof(struct rb_fields)); VALUE fields = rb_imemo_new(imemo_fields, owner, sizeof(struct rb_fields));
FL_SET_RAW(fields, OBJ_FIELD_EXTERNAL); FL_SET_RAW(fields, OBJ_FIELD_EXTERNAL);
IMEMO_OBJ_FIELDS(fields)->as.external.ptr = ALLOC_N(VALUE, capa); IMEMO_OBJ_FIELDS(fields)->as.external.ptr = ALLOC_N(VALUE, capa);
return fields; return fields;
@ -126,23 +126,23 @@ imemo_fields_new(VALUE klass, size_t capa)
} }
VALUE VALUE
rb_imemo_fields_new(VALUE klass, size_t capa) rb_imemo_fields_new(VALUE owner, size_t capa)
{ {
return imemo_fields_new(klass, capa); return imemo_fields_new(owner, capa);
} }
static VALUE static VALUE
imemo_fields_new_complex(VALUE klass, size_t capa) imemo_fields_new_complex(VALUE owner, size_t capa)
{ {
VALUE fields = imemo_fields_new(klass, sizeof(struct rb_fields)); VALUE fields = imemo_fields_new(owner, sizeof(struct rb_fields));
IMEMO_OBJ_FIELDS(fields)->as.complex.table = st_init_numtable_with_size(capa); IMEMO_OBJ_FIELDS(fields)->as.complex.table = st_init_numtable_with_size(capa);
return fields; return fields;
} }
VALUE VALUE
rb_imemo_fields_new_complex(VALUE klass, size_t capa) rb_imemo_fields_new_complex(VALUE owner, size_t capa)
{ {
return imemo_fields_new_complex(klass, capa); return imemo_fields_new_complex(owner, capa);
} }
static int static int
@ -161,9 +161,9 @@ imemo_fields_complex_wb_i(st_data_t key, st_data_t value, st_data_t arg)
} }
VALUE VALUE
rb_imemo_fields_new_complex_tbl(VALUE klass, st_table *tbl) rb_imemo_fields_new_complex_tbl(VALUE owner, st_table *tbl)
{ {
VALUE fields = imemo_fields_new(klass, sizeof(struct rb_fields)); VALUE fields = imemo_fields_new(owner, sizeof(struct rb_fields));
IMEMO_OBJ_FIELDS(fields)->as.complex.table = tbl; IMEMO_OBJ_FIELDS(fields)->as.complex.table = tbl;
st_foreach(tbl, imemo_fields_trigger_wb_i, (st_data_t)fields); st_foreach(tbl, imemo_fields_trigger_wb_i, (st_data_t)fields);
return fields; return fields;
@ -176,7 +176,7 @@ rb_imemo_fields_clone(VALUE fields_obj)
VALUE clone; VALUE clone;
if (rb_shape_too_complex_p(shape_id)) { if (rb_shape_too_complex_p(shape_id)) {
clone = rb_imemo_fields_new_complex(CLASS_OF(fields_obj), 0); clone = rb_imemo_fields_new_complex(rb_imemo_fields_owner(fields_obj), 0);
RBASIC_SET_SHAPE_ID(clone, shape_id); RBASIC_SET_SHAPE_ID(clone, shape_id);
st_table *src_table = rb_imemo_fields_complex_tbl(fields_obj); st_table *src_table = rb_imemo_fields_complex_tbl(fields_obj);
st_table *dest_table = rb_imemo_fields_complex_tbl(clone); st_table *dest_table = rb_imemo_fields_complex_tbl(clone);
@ -184,7 +184,7 @@ rb_imemo_fields_clone(VALUE fields_obj)
st_foreach(dest_table, imemo_fields_complex_wb_i, (st_data_t)clone); st_foreach(dest_table, imemo_fields_complex_wb_i, (st_data_t)clone);
} }
else { else {
clone = imemo_fields_new(CLASS_OF(fields_obj), RSHAPE_CAPACITY(shape_id)); clone = imemo_fields_new(rb_imemo_fields_owner(fields_obj), RSHAPE_CAPACITY(shape_id));
RBASIC_SET_SHAPE_ID(clone, shape_id); RBASIC_SET_SHAPE_ID(clone, shape_id);
VALUE *fields = rb_imemo_fields_ptr(clone); VALUE *fields = rb_imemo_fields_ptr(clone);
attr_index_t fields_count = RSHAPE_LEN(shape_id); attr_index_t fields_count = RSHAPE_LEN(shape_id);

2
internal/class.h
View file

@ -546,7 +546,7 @@ RCLASS_WRITABLE_ENSURE_FIELDS_OBJ(VALUE obj)
RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE)); RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
rb_classext_t *ext = RCLASS_EXT_WRITABLE(obj); rb_classext_t *ext = RCLASS_EXT_WRITABLE(obj);
if (!ext->fields_obj) { if (!ext->fields_obj) {
RB_OBJ_WRITE(obj, &ext->fields_obj, rb_imemo_fields_new(rb_singleton_class(obj), 1)); RB_OBJ_WRITE(obj, &ext->fields_obj, rb_imemo_fields_new(obj, 1));
} }
return ext->fields_obj; return ext->fields_obj;
} }

12
internal/imemo.h
View file

@ -273,12 +273,18 @@ struct rb_fields {
#define OBJ_FIELD_EXTERNAL IMEMO_FL_USER0 #define OBJ_FIELD_EXTERNAL IMEMO_FL_USER0
#define IMEMO_OBJ_FIELDS(fields) ((struct rb_fields *)fields) #define IMEMO_OBJ_FIELDS(fields) ((struct rb_fields *)fields)
VALUE rb_imemo_fields_new(VALUE klass, size_t capa); VALUE rb_imemo_fields_new(VALUE owner, size_t capa);
VALUE rb_imemo_fields_new_complex(VALUE klass, size_t capa); VALUE rb_imemo_fields_new_complex(VALUE owner, size_t capa);
VALUE rb_imemo_fields_new_complex_tbl(VALUE klass, st_table *tbl); VALUE rb_imemo_fields_new_complex_tbl(VALUE owner, st_table *tbl);
VALUE rb_imemo_fields_clone(VALUE fields_obj); VALUE rb_imemo_fields_clone(VALUE fields_obj);
void rb_imemo_fields_clear(VALUE fields_obj); void rb_imemo_fields_clear(VALUE fields_obj);
static inline VALUE
rb_imemo_fields_owner(VALUE fields_obj)
{
return CLASS_OF(fields_obj);
}
static inline VALUE * static inline VALUE *
rb_imemo_fields_ptr(VALUE obj_fields) rb_imemo_fields_ptr(VALUE obj_fields)
{ {

13
shape.c
View file

@ -877,8 +877,17 @@ shape_get_next(rb_shape_t *shape, VALUE obj, ID id, bool emit_warnings)
#endif #endif
VALUE klass; VALUE klass;
if (IMEMO_TYPE_P(obj, imemo_fields)) { // HACK if (IMEMO_TYPE_P(obj, imemo_fields)) {
klass = CLASS_OF(obj); VALUE owner = rb_imemo_fields_owner(obj);
switch (BUILTIN_TYPE(owner)) {
case T_CLASS:
case T_MODULE:
klass = rb_singleton_class(owner);
break;
default:
klass = rb_obj_class(owner);
break;
}
} }
else { else {
klass = rb_obj_class(obj); klass = rb_obj_class(obj);

7
test/ruby/test_shapes.rb
View file

@ -149,11 +149,14 @@ class TestShapes < Test::Unit::TestCase
def test_too_many_ivs_on_class def test_too_many_ivs_on_class
obj = Class.new obj = Class.new
(MANY_IVS + 1).times do obj.instance_variable_set(:@test_too_many_ivs_on_class, 1)
refute_predicate RubyVM::Shape.of(obj), :too_complex?
MANY_IVS.times do
obj.instance_variable_set(:"@a#{_1}", 1) obj.instance_variable_set(:"@a#{_1}", 1)
end end
assert_false RubyVM::Shape.of(obj).too_complex? refute_predicate RubyVM::Shape.of(obj), :too_complex?
end end
def test_removing_when_too_many_ivs_on_class def test_removing_when_too_many_ivs_on_class

24
variable.c
View file

@ -1687,10 +1687,10 @@ imemo_fields_complex_from_obj_i(ID key, VALUE val, st_data_t arg)
} }
static VALUE static VALUE
imemo_fields_complex_from_obj(VALUE klass, VALUE source_fields_obj, shape_id_t shape_id) imemo_fields_complex_from_obj(VALUE owner, VALUE source_fields_obj, shape_id_t shape_id)
{ {
attr_index_t len = source_fields_obj ? RSHAPE_LEN(RBASIC_SHAPE_ID(source_fields_obj)) : 0; attr_index_t len = source_fields_obj ? RSHAPE_LEN(RBASIC_SHAPE_ID(source_fields_obj)) : 0;
VALUE fields_obj = rb_imemo_fields_new_complex(klass, len + 1); VALUE fields_obj = rb_imemo_fields_new_complex(owner, len + 1);
rb_field_foreach(source_fields_obj, imemo_fields_complex_from_obj_i, (st_data_t)fields_obj, false); rb_field_foreach(source_fields_obj, imemo_fields_complex_from_obj_i, (st_data_t)fields_obj, false);
RBASIC_SET_SHAPE_ID(fields_obj, shape_id); RBASIC_SET_SHAPE_ID(fields_obj, shape_id);
@ -1699,9 +1699,9 @@ imemo_fields_complex_from_obj(VALUE klass, VALUE source_fields_obj, shape_id_t s
} }
static VALUE static VALUE
imemo_fields_copy_capa(VALUE klass, VALUE source_fields_obj, attr_index_t new_size) imemo_fields_copy_capa(VALUE owner, VALUE source_fields_obj, attr_index_t new_size)
{ {
VALUE fields_obj = rb_imemo_fields_new(klass, new_size); VALUE fields_obj = rb_imemo_fields_new(owner, new_size);
if (source_fields_obj) { if (source_fields_obj) {
attr_index_t fields_count = RSHAPE_LEN(RBASIC_SHAPE_ID(source_fields_obj)); attr_index_t fields_count = RSHAPE_LEN(RBASIC_SHAPE_ID(source_fields_obj));
VALUE *fields = rb_imemo_fields_ptr(fields_obj); VALUE *fields = rb_imemo_fields_ptr(fields_obj);
@ -1853,7 +1853,7 @@ general_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val, void *data,
} }
static VALUE static VALUE
imemo_fields_set(VALUE klass, VALUE fields_obj, shape_id_t target_shape_id, ID field_name, VALUE val, bool concurrent) imemo_fields_set(VALUE owner, VALUE fields_obj, shape_id_t target_shape_id, ID field_name, VALUE val, bool concurrent)
{ {
const VALUE original_fields_obj = fields_obj; const VALUE original_fields_obj = fields_obj;
shape_id_t current_shape_id = fields_obj ? RBASIC_SHAPE_ID(fields_obj) : ROOT_SHAPE_ID; shape_id_t current_shape_id = fields_obj ? RBASIC_SHAPE_ID(fields_obj) : ROOT_SHAPE_ID;
@ -1868,7 +1868,7 @@ imemo_fields_set(VALUE klass, VALUE fields_obj, shape_id_t target_shape_id, ID f
} }
} }
else { else {
fields_obj = imemo_fields_complex_from_obj(klass, original_fields_obj, target_shape_id); fields_obj = imemo_fields_complex_from_obj(owner, original_fields_obj, target_shape_id);
current_shape_id = target_shape_id; current_shape_id = target_shape_id;
} }
@ -1882,7 +1882,7 @@ imemo_fields_set(VALUE klass, VALUE fields_obj, shape_id_t target_shape_id, ID f
else { else {
attr_index_t index = RSHAPE_INDEX(target_shape_id); attr_index_t index = RSHAPE_INDEX(target_shape_id);
if (concurrent || index >= RSHAPE_CAPACITY(current_shape_id)) { if (concurrent || index >= RSHAPE_CAPACITY(current_shape_id)) {
fields_obj = imemo_fields_copy_capa(klass, original_fields_obj, RSHAPE_CAPACITY(target_shape_id)); fields_obj = imemo_fields_copy_capa(owner, original_fields_obj, RSHAPE_CAPACITY(target_shape_id));
} }
VALUE *table = rb_imemo_fields_ptr(fields_obj); VALUE *table = rb_imemo_fields_ptr(fields_obj);
@ -1905,7 +1905,7 @@ generic_field_set(VALUE obj, shape_id_t target_shape_id, ID field_name, VALUE va
} }
const VALUE original_fields_obj = rb_obj_fields(obj, field_name); const VALUE original_fields_obj = rb_obj_fields(obj, field_name);
VALUE fields_obj = imemo_fields_set(rb_obj_class(obj), original_fields_obj, target_shape_id, field_name, val, false); VALUE fields_obj = imemo_fields_set(obj, original_fields_obj, target_shape_id, field_name, val, false);
rb_obj_set_fields(obj, fields_obj, field_name, original_fields_obj); rb_obj_set_fields(obj, fields_obj, field_name, original_fields_obj);
} }
@ -2340,7 +2340,7 @@ rb_copy_generic_ivar(VALUE dest, VALUE obj)
return; return;
} }
new_fields_obj = rb_imemo_fields_new(rb_obj_class(dest), RSHAPE_CAPACITY(dest_shape_id)); new_fields_obj = rb_imemo_fields_new(dest, RSHAPE_CAPACITY(dest_shape_id));
VALUE *src_buf = rb_imemo_fields_ptr(fields_obj); VALUE *src_buf = rb_imemo_fields_ptr(fields_obj);
VALUE *dest_buf = rb_imemo_fields_ptr(new_fields_obj); VALUE *dest_buf = rb_imemo_fields_ptr(new_fields_obj);
rb_shape_copy_fields(new_fields_obj, dest_buf, dest_shape_id, src_buf, src_shape_id); rb_shape_copy_fields(new_fields_obj, dest_buf, dest_shape_id, src_buf, src_shape_id);
@ -4640,7 +4640,7 @@ class_fields_ivar_set(VALUE klass, VALUE fields_obj, ID id, VALUE val, bool conc
{ {
bool existing = true; bool existing = true;
const VALUE original_fields_obj = fields_obj; const VALUE original_fields_obj = fields_obj;
fields_obj = original_fields_obj ? original_fields_obj : rb_imemo_fields_new(rb_singleton_class(klass), 1); fields_obj = original_fields_obj ? original_fields_obj : rb_imemo_fields_new(klass, 1);
shape_id_t current_shape_id = RBASIC_SHAPE_ID(fields_obj); shape_id_t current_shape_id = RBASIC_SHAPE_ID(fields_obj);
shape_id_t next_shape_id = current_shape_id; shape_id_t next_shape_id = current_shape_id;
@ -4660,7 +4660,7 @@ class_fields_ivar_set(VALUE klass, VALUE fields_obj, ID id, VALUE val, bool conc
next_shape_id = rb_shape_transition_add_ivar(fields_obj, id); next_shape_id = rb_shape_transition_add_ivar(fields_obj, id);
if (UNLIKELY(rb_shape_too_complex_p(next_shape_id))) { if (UNLIKELY(rb_shape_too_complex_p(next_shape_id))) {
fields_obj = imemo_fields_complex_from_obj(rb_singleton_class(klass), fields_obj, next_shape_id); fields_obj = imemo_fields_complex_from_obj(klass, fields_obj, next_shape_id);
goto too_complex; goto too_complex;
} }
@ -4670,7 +4670,7 @@ class_fields_ivar_set(VALUE klass, VALUE fields_obj, ID id, VALUE val, bool conc
if (next_capacity > current_capacity) { if (next_capacity > current_capacity) {
// We allocate a new fields_obj even when concurrency isn't a concern // We allocate a new fields_obj even when concurrency isn't a concern
// so that we're embedded as long as possible. // so that we're embedded as long as possible.
fields_obj = imemo_fields_copy_capa(rb_singleton_class(klass), fields_obj, next_capacity); fields_obj = imemo_fields_copy_capa(klass, fields_obj, next_capacity);
} }
RUBY_ASSERT(RSHAPE(next_shape_id)->type == SHAPE_IVAR); RUBY_ASSERT(RSHAPE(next_shape_id)->type == SHAPE_IVAR);