diff options
| author | Jean Boussier <[email protected]> | 2023-10-27 16:41:03 +0200 |
|---|---|---|
| committer | Jean Boussier <[email protected]> | 2023-10-27 21:09:03 +0200 |
| commit | 4aee6931c35a80af846f7100cb8aa1525618e580 () | |
| tree | 73a6039a530768d14cae595b2ccbd563257f2152 /shape.c | |
| parent | d654d580f388a1ffc60e74d4b05f753c884ec543 (diff) | |
Make get_next_shape_internal idempotent
Since the check for MAX_SHAPE_ID was done before even checking if the transition we're looking for even exists, as soon as the max shape is reached, get_next_shape_internal would always return `TOO_COMPLEX` regardless of whether the transition we're looking for already exist or not. In addition to entirely de-optimize all newly created objects, it also made an assertion fail in `vm_setivar`: ``` vm_setivar:rb_shape_get_next_iv_shape(rb_shape_get_shape_by_id(source_shape_id), id) == dest_shape ```
| -rw-r--r-- | shape.c | 92 |
1 files changed, 44 insertions, 48 deletions
@@ -461,64 +461,60 @@ get_next_shape_internal(rb_shape_t * shape, ID id, enum shape_type shape_type, b *variation_created = false; - if (GET_SHAPE_TREE()->next_shape_id <= MAX_SHAPE_ID) { - RB_VM_LOCK_ENTER(); - { - // If the current shape has children - if (shape->edges) { - // Check if it only has one child - if (SINGLE_CHILD_P(shape->edges)) { - rb_shape_t * child = SINGLE_CHILD(shape->edges); - // If the one child has a matching edge name, then great, - // we found what we want. - if (child->edge_name == id) { - res = child; - } - else { - // Otherwise we're going to have to create a new shape - // and insert it as a child node, so create an id - // table and insert the existing child - shape->edges = rb_id_table_create(2); - rb_id_table_insert(shape->edges, child->edge_name, (VALUE)child); - } } - else { - // If it has more than one child, do a hash lookup to find it. - VALUE lookup_result; - if (rb_id_table_lookup(shape->edges, id, &lookup_result)) { - res = (rb_shape_t *)lookup_result; - } } - // If the shape we were looking for above was found, - // then `res` will be set to the child. If it isn't set, then - // we know we need a new child shape, and that we must insert - // it in to the table. - if (!res) { - if (new_variations_allowed) { - *variation_created = true; - rb_shape_t * new_shape = rb_shape_alloc_new_child(id, shape, shape_type); - rb_id_table_insert(shape->edges, id, (VALUE)new_shape); - res = new_shape; - } - else { - res = rb_shape_get_shape_by_id(OBJ_TOO_COMPLEX_SHAPE_ID); - } - } } else { - // If the shape didn't have any outgoing edges, then create - // the new outgoing edge and tag the pointer. rb_shape_t * new_shape = rb_shape_alloc_new_child(id, shape, shape_type); - shape->edges = TAG_SINGLE_CHILD(new_shape); res = new_shape; } } - RB_VM_LOCK_LEAVE(); - } - else { - res = rb_shape_get_shape_by_id(OBJ_TOO_COMPLEX_SHAPE_ID); } return res; } |