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 /variable.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-- | variable.c | 25 |
1 files changed, 13 insertions, 12 deletions
@@ -2198,28 +2198,32 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name) case T_CLASS: case T_MODULE: IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id); - if (rb_shape_obj_too_complex(obj)) { if (!st_delete(RCLASS_IV_HASH(obj), (st_data_t *)&id, (st_data_t *)&val)) { val = Qundef; } } - else { - rb_shape_transition_shape_remove_ivar(obj, id, shape, &val); - } break; case T_OBJECT: { - if (rb_shape_obj_too_complex(obj)) { if (rb_st_lookup(ROBJECT_IV_HASH(obj), (st_data_t)id, (st_data_t *)&val)) { rb_st_delete(ROBJECT_IV_HASH(obj), (st_data_t *)&id, 0); } } - else { - rb_shape_transition_shape_remove_ivar(obj, id, shape, &val); - } break; } default: { - if (rb_shape_obj_too_complex(obj)) { struct gen_ivtbl *ivtbl; if (rb_gen_ivtbl_get(obj, 0, &ivtbl)) { if (!st_delete(ivtbl->as.complex.table, (st_data_t *)&id, (st_data_t *)&val)) { @@ -2227,9 +2231,6 @@ rb_obj_remove_instance_variable(VALUE obj, VALUE name) } } } - else { - rb_shape_transition_shape_remove_ivar(obj, id, shape, &val); - } break; } } |