Extract rb_shape_free_all

This commit is contained in:
Jean Boussier 2025-05-08 17:38:39 +02:00
parent 30ef0f180b
commit 7116b0a7f1
Notes: git 2025-05-09 08:23:14 +00:00
3 changed files with 17 additions and 10 deletions

15
shape.c
View File

@ -1431,6 +1431,21 @@ Init_default_shapes(void)
get_next_shape_internal(shape, id_frozen, SHAPE_FROZEN, &dont_care, true);
}
void
rb_shape_free_all(void)
{
rb_shape_t *cursor = rb_shape_get_root_shape();
rb_shape_t *end = rb_shape_get_shape_by_id(GET_SHAPE_TREE()->next_shape_id);
while (cursor < end) {
if (cursor->edges && !SINGLE_CHILD_P(cursor->edges)) {
rb_id_table_free(cursor->edges);
}
cursor++;
}
xfree(GET_SHAPE_TREE());
}
void
Init_shape(void)
{

View File

@ -175,6 +175,7 @@ rb_shape_t *rb_shape_get_next_no_warnings(rb_shape_t *shape, VALUE obj, ID id);
rb_shape_t *rb_shape_object_id_shape(VALUE obj);
bool rb_shape_has_object_id(rb_shape_t *shape);
attr_index_t rb_shape_object_id_index(rb_shape_t *shape);
void rb_shape_free_all(void);
rb_shape_t *rb_shape_rebuild_shape(rb_shape_t *initial_shape, rb_shape_t *dest_shape);

11
vm.c
View File

@ -3115,16 +3115,7 @@ ruby_vm_destruct(rb_vm_t *vm)
rb_id_table_free(RCLASS(rb_mRubyVMFrozenCore)->m_tbl);
rb_shape_t *cursor = rb_shape_get_root_shape();
rb_shape_t *end = rb_shape_get_shape_by_id(GET_SHAPE_TREE()->next_shape_id);
while (cursor < end) {
// 0x1 == SINGLE_CHILD_P
if (cursor->edges && !(((uintptr_t)cursor->edges) & 0x1))
rb_id_table_free(cursor->edges);
cursor += 1;
}
xfree(GET_SHAPE_TREE());
rb_shape_free_all();
st_free_table(vm->static_ext_inits);