diff options
| author | Jean Boussier <[email protected]> | 2023-11-01 12:15:12 +0100 |
|---|---|---|
| committer | Jean Boussier <[email protected]> | 2023-11-01 15:21:55 +0100 |
| commit | b77148ae9f74c46e645d9ce7387619e67109d935 () | |
| tree | 162ee0019e9eb980c9ea324c75f7ac125d426293 /shape.c | |
| parent | 9c6dd25093f49d926ac71c3b91e1320d4bbc553a (diff) | |
remove_instance_variable: Handle running out of shapes
`remove_shape_recursive` wasn't considering that if we run out of shapes, it might have to transition to SHAPE_TOO_COMPLEX. When this happens, we now return with an error and the caller initiates the evacuation.
| -rw-r--r-- | shape.c | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -585,6 +585,10 @@ remove_shape_recursive(VALUE obj, ID id, rb_shape_t * shape, VALUE * removed) if (new_parent) { bool dont_care; rb_shape_t * new_child = get_next_shape_internal(new_parent, shape->edge_name, shape->type, &dont_care, true); 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); @@ -601,13 +605,22 @@ remove_shape_recursive(VALUE obj, ID id, rb_shape_t * shape, VALUE * removed) } } -void rb_shape_transition_shape_remove_ivar(VALUE obj, ID id, rb_shape_t *shape, VALUE * removed) { rb_shape_t * new_shape = remove_shape_recursive(obj, id, shape, removed); if (new_shape) { rb_shape_set_shape(obj, new_shape); } } rb_shape_t * |