6 files changed, 67 insertions, 67 deletions
@@ -1865,7 +1865,6 @@ static VALUE
 object_id(VALUE obj)
 {
 VALUE id = Qfalse;
- rb_shape_t *shape = rb_obj_shape(obj);
 unsigned int lock_lev;
 // We could avoid locking if the object isn't shareable
@@ -1873,16 +1872,17 @@ object_id(VALUE obj)
 // we'd at least need to generate the object_id using atomics.
 lock_lev = rb_gc_vm_lock();
- if (rb_shape_has_object_id(shape)) {
- rb_shape_t *object_id_shape = rb_shape_object_id_shape(obj);
- id = rb_obj_field_get(obj, object_id_shape);
 }
 else {
 id = ULL2NUM(next_object_id);
 next_object_id += OBJ_ID_INCREMENT;
- rb_shape_t *object_id_shape = rb_shape_object_id_shape(obj);
- rb_obj_field_set(obj, object_id_shape, id);
 if (RB_UNLIKELY(id_to_obj_tbl)) {
 st_insert(id_to_obj_tbl, (st_data_t)id, (st_data_t)obj);
 }
@@ -53,9 +53,9 @@ void rb_obj_copy_ivs_to_hash_table(VALUE obj, st_table *table);
 void rb_obj_init_too_complex(VALUE obj, st_table *table);
 void rb_evict_ivars_to_hash(VALUE obj);
 void rb_evict_fields_to_hash(VALUE obj);
-VALUE rb_obj_field_get(VALUE obj, rb_shape_t *target_shape);
 void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
-void rb_obj_field_set(VALUE obj, rb_shape_t *target_shape, VALUE val);
 RUBY_SYMBOL_EXPORT_BEGIN
 /* variable.c (export) */
@@ -745,8 +745,8 @@ rb_shape_has_object_id(rb_shape_t *shape)
 return shape->flags & SHAPE_FL_HAS_OBJECT_ID;
 }
-rb_shape_t *
-rb_shape_object_id_shape(VALUE obj)
 {
 rb_shape_t* shape = rb_obj_shape(obj);
 RUBY_ASSERT(shape);
@@ -755,13 +755,13 @@ rb_shape_object_id_shape(VALUE obj)
 while (shape->type != SHAPE_OBJ_ID) {
 shape = RSHAPE(shape->parent_id);
 }
- return shape;
 }
-
- bool dont_care;
- rb_shape_t* next_shape = get_next_shape_internal(shape, ruby_internal_object_id, SHAPE_OBJ_ID, &dont_care, true);
- RUBY_ASSERT(next_shape);
- return next_shape;
 }
 /*
@@ -168,8 +168,8 @@ shape_id_t rb_shape_transition_complex(VALUE obj);
 bool rb_shape_transition_remove_ivar(VALUE obj, ID id, VALUE *removed);
 shape_id_t rb_shape_transition_add_ivar(VALUE obj, ID id);
 shape_id_t rb_shape_transition_add_ivar_no_warnings(VALUE obj, ID id);
-rb_shape_t *rb_shape_object_id_shape(VALUE obj);
 bool rb_shape_has_object_id(rb_shape_t *shape);
 void rb_shape_free_all(void);
@@ -681,8 +681,8 @@ class TestShapes < Test::Unit::TestCase
 id_shape = RubyVM::Shape.of(tc)
 refute_equal frozen_shape.id, id_shape.id
 assert_predicate id_shape, :too_complex?
- assert_predicate id_shape, :shape_frozen?
 assert_predicate id_shape, :has_object_id?
 assert_equal 3, tc.very_unique
 assert_equal 3, Ractor.make_shareable(tc).very_unique
@@ -1345,12 +1345,12 @@ gen_fields_tbl_count(VALUE obj, const struct gen_fields_tbl *fields_tbl)
 }
 VALUE
-rb_obj_field_get(VALUE obj, rb_shape_t *target_shape)
 {
 RUBY_ASSERT(!SPECIAL_CONST_P(obj));
- RUBY_ASSERT(target_shape->type == SHAPE_IVAR || target_shape->type == SHAPE_OBJ_ID);
- if (rb_shape_too_complex_p(target_shape)) {
 st_table *fields_hash;
 switch (BUILTIN_TYPE(obj)) {
 case T_CLASS:
@@ -1370,12 +1370,12 @@ rb_obj_field_get(VALUE obj, rb_shape_t *target_shape)
 break;
 }
 VALUE value = Qundef;
- st_lookup(fields_hash, target_shape->edge_name, &value);
 RUBY_ASSERT(!UNDEF_P(value));
 return value;
 }
- attr_index_t attr_index = target_shape->next_field_index - 1;
 VALUE *fields;
 switch (BUILTIN_TYPE(obj)) {
 case T_CLASS:
@@ -1689,7 +1689,7 @@ static struct general_ivar_set_result
 general_ivar_set(VALUE obj, ID id, VALUE val, void *data,
 VALUE *(*shape_fields_func)(VALUE, void *),
 void (*shape_resize_fields_func)(VALUE, attr_index_t, attr_index_t, void *),
- void (*set_shape_func)(VALUE, rb_shape_t *, void *),
 void (*transition_too_complex_func)(VALUE, void *),
 st_table *(*too_complex_table_func)(VALUE, void *))
 {
@@ -1726,7 +1726,7 @@ general_ivar_set(VALUE obj, ID id, VALUE val, void *data,
 RUBY_ASSERT(next_shape->type == SHAPE_IVAR);
 RUBY_ASSERT(index == (next_shape->next_field_index - 1));
- set_shape_func(obj, next_shape, data);
 }
 VALUE *table = shape_fields_func(obj, data);
@@ -1748,34 +1748,36 @@ too_complex:
 }
 static void
-general_field_set(VALUE obj, rb_shape_t *target_shape, VALUE val, void *data,
 VALUE *(*shape_fields_func)(VALUE, void *),
 void (*shape_resize_fields_func)(VALUE, attr_index_t, attr_index_t, void *),
- void (*set_shape_func)(VALUE, rb_shape_t *, void *),
 void (*transition_too_complex_func)(VALUE, void *),
 st_table *(*too_complex_table_func)(VALUE, void *))
 {
 rb_shape_t *current_shape = rb_obj_shape(obj);
- if (UNLIKELY(rb_shape_too_complex_p(target_shape))) {
 if (UNLIKELY(!rb_shape_too_complex_p(current_shape))) {
 transition_too_complex_func(obj, data);
 }
- set_shape_func(obj, target_shape, data);
-
 st_table *table = too_complex_table_func(obj, data);
- st_insert(table, (st_data_t)target_shape->edge_name, (st_data_t)val);
 RB_OBJ_WRITTEN(obj, Qundef, val);
 }
 else {
- attr_index_t index = target_shape->next_field_index - 1;
 if (index >= current_shape->capacity) {
- shape_resize_fields_func(obj, current_shape->capacity, target_shape->capacity, data);
 }
- if (target_shape->next_field_index > current_shape->next_field_index) {
- set_shape_func(obj, target_shape, data);
 }
 VALUE *table = shape_fields_func(obj, data);
@@ -1787,7 +1789,7 @@ struct gen_fields_lookup_ensure_size {
 VALUE obj;
 ID id;
 struct gen_fields_tbl *fields_tbl;
- rb_shape_t *shape;
 bool resize;
 };
@@ -1801,25 +1803,25 @@ generic_fields_lookup_ensure_size(st_data_t *k, st_data_t *v, st_data_t u, int e
 if (!existing || fields_lookup->resize) {
 if (existing) {
- RUBY_ASSERT(fields_lookup->shape->type == SHAPE_IVAR || fields_lookup->shape->type == SHAPE_OBJ_ID);
- RUBY_ASSERT(RSHAPE(fields_lookup->shape->parent_id)->capacity < fields_lookup->shape->capacity);
 }
 else {
 FL_SET_RAW((VALUE)*k, FL_EXIVAR);
 }
- fields_tbl = gen_fields_tbl_resize(fields_tbl, fields_lookup->shape->capacity);
 *v = (st_data_t)fields_tbl;
 }
 RUBY_ASSERT(FL_TEST((VALUE)*k, FL_EXIVAR));
 fields_lookup->fields_tbl = fields_tbl;
- if (fields_lookup->shape) {
 #if SHAPE_IN_BASIC_FLAGS
- rb_shape_set_shape(fields_lookup->obj, fields_lookup->shape);
 #else
- fields_tbl->shape_id = rb_shape_id(fields_lookup->shape);
 #endif
 }
@@ -1853,11 +1855,11 @@ generic_ivar_set_shape_resize_fields(VALUE obj, attr_index_t _old_capa, attr_ind
 }
 static void
-generic_ivar_set_set_shape(VALUE obj, rb_shape_t *shape, void *data)
 {
 struct gen_fields_lookup_ensure_size *fields_lookup = data;
- fields_lookup->shape = shape;
 }
 static void
@@ -1901,30 +1903,28 @@ generic_ivar_set(VALUE obj, ID id, VALUE val)
 .obj = obj,
 .id = id,
 .resize = false,
- .shape = NULL,
 };
 general_ivar_set(obj, id, val, &fields_lookup,
 generic_ivar_set_shape_fields,
 generic_ivar_set_shape_resize_fields,
- generic_ivar_set_set_shape,
 generic_ivar_set_transition_too_complex,
 generic_ivar_set_too_complex_table);
 }
 static void
-generic_field_set(VALUE obj, rb_shape_t *target_shape, VALUE val)
 {
 struct gen_fields_lookup_ensure_size fields_lookup = {
 .obj = obj,
 .resize = false,
- .shape = NULL,
 };
- general_field_set(obj, target_shape, val, &fields_lookup,
 generic_ivar_set_shape_fields,
 generic_ivar_set_shape_resize_fields,
- generic_ivar_set_set_shape,
 generic_ivar_set_transition_too_complex,
 generic_ivar_set_too_complex_table);
 }
@@ -1982,9 +1982,9 @@ obj_ivar_set_shape_resize_fields(VALUE obj, attr_index_t old_capa, attr_index_t
 }
 static void
-obj_ivar_set_set_shape(VALUE obj, rb_shape_t *shape, void *_data)
 {
- rb_shape_set_shape(obj, shape);
 }
 static void
@@ -2007,18 +2007,18 @@ rb_obj_ivar_set(VALUE obj, ID id, VALUE val)
 return general_ivar_set(obj, id, val, NULL,
 obj_ivar_set_shape_fields,
 obj_ivar_set_shape_resize_fields,
- obj_ivar_set_set_shape,
 obj_ivar_set_transition_too_complex,
 obj_ivar_set_too_complex_table).index;
 }
 static void
-obj_field_set(VALUE obj, rb_shape_t *target_shape, VALUE val)
 {
- general_field_set(obj, target_shape, val, NULL,
 obj_ivar_set_shape_fields,
 obj_ivar_set_shape_resize_fields,
- obj_ivar_set_set_shape,
 obj_ivar_set_transition_too_complex,
 obj_ivar_set_too_complex_table);
 }
@@ -2138,22 +2138,22 @@ rb_ivar_set_internal(VALUE obj, ID id, VALUE val)
 ivar_set(obj, id, val);
 }
-static void class_field_set(VALUE obj, rb_shape_t *target_shape, VALUE val);
 void
-rb_obj_field_set(VALUE obj, rb_shape_t *target_shape, VALUE val)
 {
 switch (BUILTIN_TYPE(obj)) {
 case T_OBJECT:
- obj_field_set(obj, target_shape, val);
 break;
 case T_CLASS:
 case T_MODULE:
 ASSERT_vm_locking();
- class_field_set(obj, target_shape, val);
 break;
 default:
- generic_field_set(obj, target_shape, val);
 break;
 }
 }
@@ -4739,9 +4739,9 @@ class_ivar_set_shape_resize_fields(VALUE obj, attr_index_t _old_capa, attr_index
 }
 static void
-class_ivar_set_set_shape(VALUE obj, rb_shape_t *shape, void *_data)
 {
- rb_shape_set_shape(obj, shape);
 }
 static void
@@ -4772,7 +4772,7 @@ rb_class_ivar_set(VALUE obj, ID id, VALUE val)
 existing = general_ivar_set(obj, id, val, NULL,
 class_ivar_set_shape_fields,
 class_ivar_set_shape_resize_fields,
- class_ivar_set_set_shape,
 class_ivar_set_transition_too_complex,
 class_ivar_set_too_complex_table).existing;
 }
@@ -4782,13 +4782,13 @@ rb_class_ivar_set(VALUE obj, ID id, VALUE val)
 }
 static void
-class_field_set(VALUE obj, rb_shape_t *target_shape, VALUE val)
 {
 RUBY_ASSERT(RB_TYPE_P(obj, T_CLASS) || RB_TYPE_P(obj, T_MODULE));
- general_field_set(obj, target_shape, val, NULL,
 class_ivar_set_shape_fields,
 class_ivar_set_shape_resize_fields,
- class_ivar_set_set_shape,
 class_ivar_set_transition_too_complex,
 class_ivar_set_too_complex_table);
 }