From f50aa19da63067c4b0de5964b6632df20202e71c Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 15 Dec 2022 12:00:30 -0500 Subject: Revert "Fix Object Movement allocation in GC" This reverts commit 9c54466e299aa91af225bc2d92a3d7755730948f. We're seeing crashes in Shopify CI after this commit. --- shape.c | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'shape.c') diff --git a/shape.c b/shape.c index 6227958d2c..86572f9fde 100644 --- a/shape.c +++ b/shape.c @@ -403,39 +403,6 @@ 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; - } - } - - switch ((enum shape_type)dest_shape->type) { - case SHAPE_IVAR: - if (!next_shape->edges) { - return NULL; - } - if (!rb_id_table_lookup(next_shape->edges, dest_shape->edge_name, (VALUE *)&next_shape)) { - return NULL; - } - break; - case SHAPE_ROOT: - case SHAPE_FROZEN: - case SHAPE_CAPACITY_CHANGE: - case SHAPE_INITIAL_CAPACITY: - case SHAPE_T_OBJECT: - break; - } - - return next_shape; -} - rb_shape_t * rb_shape_rebuild_shape(rb_shape_t * initial_shape, rb_shape_t * dest_shape) { -- cgit v1.2.1