diff options
| author | Jean Boussier <[email protected]> | 2025-05-08 17:56:30 +0200 |
|---|---|---|
| committer | Jean Boussier <[email protected]> | 2025-05-09 10:22:51 +0200 |
| commit | f8b3fc520f2ec19bca8f30e022bd8765187da7ac () | |
| tree | 46b0120dff0a3a17353f3df5efb497d801aa0dc8 | |
| parent | 7116b0a7f1398f18346ad6f9ba805e3877d45944 (diff) | |
Refactor `rb_shape_traverse_from_new_root` to not expose `rb_shape_t`
Notes: Merged: https://.com/ruby/ruby/pull/13283
| -rw-r--r-- | gc.c | 11 | ||||
| -rw-r--r-- | shape.c | 17 | ||||
| -rw-r--r-- | shape.h | 2 |
3 files changed, 21 insertions, 9 deletions
@@ -384,13 +384,14 @@ rb_gc_rebuild_shape(VALUE obj, size_t heap_id) return (uint32_t)orig_shape_id; } - rb_shape_t *orig_shape = rb_shape_get_shape_by_id(orig_shape_id); - rb_shape_t *initial_shape = rb_shape_get_shape_by_id((shape_id_t)(heap_id + FIRST_T_OBJECT_SHAPE_ID)); - rb_shape_t *new_shape = rb_shape_traverse_from_new_root(initial_shape, orig_shape); - if (!new_shape) return 0; - return (uint32_t)rb_shape_id(new_shape); } void rb_vm_update_references(void *ptr); @@ -322,6 +322,9 @@ rb_shape_get_root_shape(void) shape_id_t rb_shape_id(rb_shape_t *shape) { return (shape_id_t)(shape - GET_SHAPE_TREE()->shape_list); } @@ -999,14 +1002,14 @@ rb_shape_id_offset(void) return sizeof(uintptr_t) - SHAPE_ID_NUM_BITS / sizeof(uintptr_t); } -rb_shape_t * -rb_shape_traverse_from_new_root(rb_shape_t *initial_shape, rb_shape_t *dest_shape) { RUBY_ASSERT(initial_shape->type == SHAPE_T_OBJECT); rb_shape_t *next_shape = initial_shape; if (dest_shape->type != initial_shape->type) { - next_shape = rb_shape_traverse_from_new_root(initial_shape, rb_shape_get_parent(dest_shape)); if (!next_shape) { return NULL; } @@ -1050,6 +1053,14 @@ rb_shape_traverse_from_new_root(rb_shape_t *initial_shape, rb_shape_t *dest_shap return next_shape; } // Rebuild a similar shape with the same ivars but starting from // a different SHAPE_T_OBJECT, and don't cary over non-canonical transitions // such as SHAPE_FROZEN or SHAPE_OBJ_ID. @@ -232,7 +232,7 @@ RBASIC_FIELDS_COUNT(VALUE obj) return rb_shape_get_shape_by_id(rb_shape_get_shape_id(obj))->next_field_index; } -rb_shape_t *rb_shape_traverse_from_new_root(rb_shape_t *initial_shape, rb_shape_t *orig_shape); bool rb_shape_set_shape_id(VALUE obj, shape_id_t shape_id); |