From 648927d71bde5df02a0490f5f45bb7fcde913376 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 15 Nov 2022 10:52:39 -0500 Subject: Refactor obj_ivar_set and vm_setivar obj_ivar_set and vm_setivar_slowpath is essentially doing the same thing, but the code is duplicated and not quite implemented in the same way, which could cause bugs. This commit refactors vm_setivar_slowpath to use obj_ivar_set. --- variable.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'variable.c') diff --git a/variable.c b/variable.c index 15e18f21ae..635e613c77 100644 --- a/variable.c +++ b/variable.c @@ -1415,36 +1415,39 @@ rb_grow_iv_list(VALUE obj) return res; } -static VALUE -obj_ivar_set(VALUE obj, ID id, VALUE val) +attr_index_t +rb_obj_ivar_set(VALUE obj, ID id, VALUE val) { attr_index_t index; - // Get the current shape - rb_shape_t * shape = rb_shape_get_shape_by_id(ROBJECT_SHAPE_ID(obj)); + shape_id_t next_shape_id = ROBJECT_SHAPE_ID(obj); + rb_shape_t *shape = rb_shape_get_shape_by_id(next_shape_id); + uint32_t num_iv = shape->capacity; - bool found = true; if (!rb_shape_get_iv_index(shape, id, &index)) { index = shape->next_iv_index; - found = false; - } + if (index >= MAX_IVARS) { + rb_raise(rb_eArgError, "too many instance variables"); + } - // Reallocating can kick off GC. We can't set the new shape - // on this object until the buffer has been allocated, otherwise - // GC could read off the end of the buffer. - if (shape->capacity <= index) { - shape = rb_grow_iv_list(obj); - } + if (UNLIKELY(shape->next_iv_index >= num_iv)) { + RUBY_ASSERT(shape->next_iv_index == num_iv); - if (!found) { - shape = rb_shape_get_next(shape, obj, id); - RUBY_ASSERT(index == (shape->next_iv_index - 1)); - rb_shape_set_shape(obj, shape); + shape = rb_grow_iv_list(obj); + RUBY_ASSERT(shape->type == SHAPE_CAPACITY_CHANGE); + } + + rb_shape_t *next_shape = rb_shape_get_next(shape, obj, id); + RUBY_ASSERT(next_shape->type == SHAPE_IVAR); + RUBY_ASSERT(index == (next_shape->next_iv_index - 1)); + next_shape_id = rb_shape_id(next_shape); + + rb_shape_set_shape(obj, next_shape); } RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[index], val); - return val; + return index; } /* Set the instance variable +val+ on object +obj+ at ivar name +id+. @@ -1455,7 +1458,7 @@ VALUE rb_vm_set_ivar_id(VALUE obj, ID id, VALUE val) { rb_check_frozen_internal(obj); - obj_ivar_set(obj, id, val); + rb_obj_ivar_set(obj, id, val); return val; } @@ -1526,7 +1529,7 @@ ivar_set(VALUE obj, ID id, VALUE val) switch (BUILTIN_TYPE(obj)) { case T_OBJECT: { - obj_ivar_set(obj, id, val); + rb_obj_ivar_set(obj, id, val); break; } case T_CLASS: -- cgit v1.2.1