diff options
| -rw-r--r-- | shape.c | 3 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -242,9 +242,10 @@ remove_shape_recursive(VALUE obj, ID id, rb_shape_t * shape, VALUE * removed) // has the same attributes as this shape. if (new_parent) { rb_shape_t * new_child = get_next_shape_internal(new_parent, shape->edge_name, shape->type); + new_child->capacity = shape->capacity; + if (new_child->type == SHAPE_IVAR) { move_iv(obj, id, shape->next_iv_index - 1, new_child->next_iv_index - 1); - } return new_child; diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 1eed081fea..c397110ae5 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1422,8 +1422,6 @@ vm_setivar(VALUE obj, ID id, VALUE val, shape_id_t dest_shape_id, attr_index_t i rb_shape_t *dest_shape = rb_shape_get_shape_by_id(dest_shape_id); shape_id_t source_shape_id = dest_shape->parent_id; - RUBY_ASSERT(dest_shape->type == SHAPE_IVAR); - if (shape_id == source_shape_id && dest_shape->edge_name == id) { RUBY_ASSERT(dest_shape_id != INVALID_SHAPE_ID && shape_id != INVALID_SHAPE_ID); |