1 files changed, 79 insertions, 23 deletions
@@ -1136,6 +1136,16 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef)
 shape_id = RCLASS_SHAPE_ID(obj);
 #endif
 attr_index_t index = 0;
 shape = rb_shape_get_shape_by_id(shape_id);
 found = rb_shape_get_iv_index(shape, id, &index);
@@ -1268,6 +1278,8 @@ generic_ivar_set(VALUE obj, ID id, VALUE val)
 attr_index_t index;
 // The returned shape will have `id` in its iv_table
 rb_shape_t *shape = rb_shape_get_shape(obj);
 bool found = rb_shape_get_iv_index(shape, id, &index);
 if (!found) {
 index = shape->next_iv_index;
@@ -1655,6 +1667,7 @@ iterate_over_shapes_with_callback(rb_shape_t *shape, rb_ivar_foreach_callback_fu
 break;
 case T_CLASS:
 case T_MODULE:
 iv_list = RCLASS_IVPTR(itr_data->obj);
 break;
 default:
@@ -1724,7 +1737,13 @@ class_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
 struct iv_itr_data itr_data;
 itr_data.obj = obj;
 itr_data.arg = arg;
- iterate_over_shapes_with_callback(shape, func, &itr_data);
 }
 void
@@ -1984,7 +2003,14 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name)
 case T_CLASS:
 case T_MODULE:
 IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id);
- rb_shape_transition_shape_remove_ivar(obj, id, shape, &val);
 break;
 case T_OBJECT: {
 if (rb_shape_obj_too_complex(obj)) {
@@ -3961,35 +3987,65 @@ rb_class_ivar_set(VALUE obj, ID key, VALUE value)
 RB_VM_LOCK_ENTER();
 {
- rb_shape_t * shape = rb_shape_get_shape(obj);
- attr_index_t idx;
- found = rb_shape_get_iv_index(shape, key, &idx);
-
- if (found) {
- // Changing an existing instance variable
- RUBY_ASSERT(RCLASS_IVPTR(obj));
-
- RCLASS_IVPTR(obj)[idx] = value;
 RB_OBJ_WRITTEN(obj, Qundef, value);
 }
 else {
- // Creating and setting a new instance variable
- // Move to a shape which fits the new ivar
- idx = shape->next_iv_index;
- shape = rb_shape_get_next(shape, obj, key);
- // We always allocate a power of two sized IV array. This way we
- // only need to realloc when we expand into a new power of two size
- if ((idx & (idx - 1)) == 0) {
- size_t newsize = idx ? idx * 2 : 1;
- REALLOC_N(RCLASS_IVPTR(obj), VALUE, newsize);
 }
- RUBY_ASSERT(RCLASS_IVPTR(obj));
- RB_OBJ_WRITE(obj, &RCLASS_IVPTR(obj)[idx], value);
- rb_shape_set_shape(obj, shape);
 }
 }
 RB_VM_LOCK_LEAVE();