tentative: remove evict workaround

Author: byroot

variable.c

@@ -1586,20 +1586,9 @@ rb_evict_fields_to_hash(VALUE obj)
 
     RUBY_ASSERT(!rb_shape_obj_too_complex(obj));
 
-    st_table *table = st_init_numtable_with_size(rb_ivar_count(obj));
-
-    // Evacuate all previous values from shape into id_table
-    rb_obj_copy_fields_to_hash_table(obj, table);
     rb_shape_t *shape = rb_shape_get_shape(obj);
-    if (rb_shape_has_object_id(shape)) {
-        rb_shape_t *object_id_shape = rb_shape_object_id_shape(obj);
-        VALUE id = rb_field_get(obj, object_id_shape);
-        st_insert(table, internal_object_id, id);
-
-        // We need to ensure the object ID is registered in id_to_obj_table
-        // before transitioning to too complex
-        rb_gc_update_id_to_obj_table(obj, id);
-    }
+    st_table *table = st_init_numtable_with_size(shape->next_field_index);
+    rb_obj_copy_fields_to_hash_table(obj, table);
     obj_transition_too_complex(obj, table);
 
     RUBY_ASSERT(rb_shape_obj_too_complex(obj));
@@ -1614,16 +1603,6 @@ rb_evict_ivars_to_hash(VALUE obj)
 
     // Evacuate all previous values from shape into id_table
     rb_obj_copy_ivs_to_hash_table(obj, table);
-    rb_shape_t *shape = rb_shape_get_shape(obj);
-    if (rb_shape_has_object_id(shape)) {
-        rb_shape_t *object_id_shape = rb_shape_object_id_shape(obj);
-        VALUE id = rb_field_get(obj, object_id_shape);
-        st_insert(table, internal_object_id, id);
-
-        // We need to ensure the object ID is registered in id_to_obj_table
-        // before transitioning to too complex
-        rb_gc_update_id_to_obj_table(obj, id);
-    }
     obj_transition_too_complex(obj, table);
 
     RUBY_ASSERT(rb_shape_obj_too_complex(obj));