Skip to content

Commit a572ec1

Browse files
committed
Move rb_gc_impl_objspace_free to shutdown section
1 parent 56b89d3 commit a572ec1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

gc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -609,14 +609,14 @@ typedef struct gc_function_map {
609609
// Bootup
610610
void *(*objspace_alloc)(void);
611611
void (*objspace_init)(void *objspace_ptr);
612-
void (*objspace_free)(void *objspace_ptr);
613612
void *(*ractor_cache_alloc)(void *objspace_ptr, void *ractor);
614613
void (*ractor_cache_free)(void *objspace_ptr, void *cache);
615614
void (*set_params)(void *objspace_ptr);
616615
void (*init)(void);
617616
size_t *(*heap_sizes)(void *objspace_ptr);
618617
// Shutdown
619618
void (*shutdown_free_objects)(void *objspace_ptr);
619+
void (*objspace_free)(void *objspace_ptr);
620620
// GC
621621
void (*start)(void *objspace_ptr, bool full_mark, bool immediate_mark, bool immediate_sweep, bool compact);
622622
bool (*during_gc_p)(void *objspace_ptr);
@@ -786,14 +786,14 @@ ruby_modular_gc_init(void)
786786
// Bootup
787787
load_modular_gc_func(objspace_alloc);
788788
load_modular_gc_func(objspace_init);
789-
load_modular_gc_func(objspace_free);
790789
load_modular_gc_func(ractor_cache_alloc);
791790
load_modular_gc_func(ractor_cache_free);
792791
load_modular_gc_func(set_params);
793792
load_modular_gc_func(init);
794793
load_modular_gc_func(heap_sizes);
795794
// Shutdown
796795
load_modular_gc_func(shutdown_free_objects);
796+
load_modular_gc_func(objspace_free);
797797
// GC
798798
load_modular_gc_func(start);
799799
load_modular_gc_func(during_gc_p);
@@ -869,14 +869,14 @@ ruby_modular_gc_init(void)
869869
// Bootup
870870
# define rb_gc_impl_objspace_alloc rb_gc_functions.objspace_alloc
871871
# define rb_gc_impl_objspace_init rb_gc_functions.objspace_init
872-
# define rb_gc_impl_objspace_free rb_gc_functions.objspace_free
873872
# define rb_gc_impl_ractor_cache_alloc rb_gc_functions.ractor_cache_alloc
874873
# define rb_gc_impl_ractor_cache_free rb_gc_functions.ractor_cache_free
875874
# define rb_gc_impl_set_params rb_gc_functions.set_params
876875
# define rb_gc_impl_init rb_gc_functions.init
877876
# define rb_gc_impl_heap_sizes rb_gc_functions.heap_sizes
878877
// Shutdown
879878
# define rb_gc_impl_shutdown_free_objects rb_gc_functions.shutdown_free_objects
879+
# define rb_gc_impl_objspace_free rb_gc_functions.objspace_free
880880
// GC
881881
# define rb_gc_impl_start rb_gc_functions.start
882882
# define rb_gc_impl_during_gc_p rb_gc_functions.during_gc_p

gc/gc_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ struct rb_gc_object_metadata_entry {
3535
// Bootup
3636
GC_IMPL_FN void *rb_gc_impl_objspace_alloc(void);
3737
GC_IMPL_FN void rb_gc_impl_objspace_init(void *objspace_ptr);
38-
GC_IMPL_FN void rb_gc_impl_objspace_free(void *objspace_ptr);
3938
GC_IMPL_FN void *rb_gc_impl_ractor_cache_alloc(void *objspace_ptr, void *ractor);
4039
GC_IMPL_FN void rb_gc_impl_ractor_cache_free(void *objspace_ptr, void *cache);
4140
GC_IMPL_FN void rb_gc_impl_set_params(void *objspace_ptr);
4241
GC_IMPL_FN void rb_gc_impl_init(void);
4342
GC_IMPL_FN size_t *rb_gc_impl_heap_sizes(void *objspace_ptr);
4443
// Shutdown
4544
GC_IMPL_FN void rb_gc_impl_shutdown_free_objects(void *objspace_ptr);
45+
GC_IMPL_FN void rb_gc_impl_objspace_free(void *objspace_ptr);
4646
// GC
4747
GC_IMPL_FN void rb_gc_impl_start(void *objspace_ptr, bool full_mark, bool immediate_mark, bool immediate_sweep, bool compact);
4848
GC_IMPL_FN bool rb_gc_impl_during_gc_p(void *objspace_ptr);

0 commit comments

Comments
 (0)