@@ -665,7 +665,6 @@ typedef struct gc_function_map {
665665 // Object ID
666666 VALUE (* object_id )(void * objspace_ptr , VALUE obj );
667667 VALUE (* object_id_to_ref )(void * objspace_ptr , VALUE object_id );
668- void (* object_id_move )(void * objspace_ptr , VALUE dest , VALUE src );
669668 // Forking
670669 void (* before_fork )(void * objspace_ptr );
671670 void (* after_fork )(void * objspace_ptr , rb_pid_t pid );
@@ -843,7 +842,6 @@ ruby_modular_gc_init(void)
843842 // Object ID
844843 load_modular_gc_func (object_id );
845844 load_modular_gc_func (object_id_to_ref );
846- load_modular_gc_func (object_id_move );
847845 // Forking
848846 load_modular_gc_func (before_fork );
849847 load_modular_gc_func (after_fork );
@@ -927,7 +925,6 @@ ruby_modular_gc_init(void)
927925// Object ID
928926# define rb_gc_impl_object_id rb_gc_functions.object_id
929927# define rb_gc_impl_object_id_to_ref rb_gc_functions.object_id_to_ref
930- # define rb_gc_impl_object_id_move rb_gc_functions.object_id_move
931928// Forking
932929# define rb_gc_impl_before_fork rb_gc_functions.before_fork
933930# define rb_gc_impl_after_fork rb_gc_functions.after_fork
@@ -2664,12 +2661,7 @@ rb_gc_mark_roots(void *objspace, const char **categoryp)
26642661void
26652662rb_gc_ractor_moved (VALUE dest , VALUE src )
26662663{
2667- void * objspace = rb_gc_get_objspace ();
2668- if (UNLIKELY (FL_TEST_RAW (src , FL_SEEN_OBJ_ID ))) {
2669- rb_gc_impl_object_id_move (objspace , dest , src );
2670- }
2671-
2672- rb_gc_obj_free (objspace , src );
2664+ rb_gc_obj_free (rb_gc_get_objspace (), src );
26732665 MEMZERO ((void * )src , char , rb_gc_obj_slot_size (src ));
26742666 RBASIC (src )-> flags = T_OBJECT | FL_FREEZE ; // Avoid mutations using bind_call, etc.
26752667}
0 commit comments