diff options
| author | Peter Zhu <peter@peterzhu.ca> | 2024-07-18 13:39:24 -0400 |
|---|---|---|
| committer | Peter Zhu <peter@peterzhu.ca> | 2024-07-19 08:53:32 -0400 |
| commit | 4b05d2dbb056617dbb9dd90c7d22bf716ee855ee (patch) | |
| tree | 91fc0e1263dc57a2bf2de74d6e46e7b9fb5a5dc3 | |
| parent | 57d9b8ee07ca11e5de4038b53b3d7a58ea631ffd (diff) | |
Make rb_gc_impl_undefine_finalizer return void
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/11199
| -rw-r--r-- | gc.c | 6 | ||||
| -rw-r--r-- | gc/default.c | 3 | ||||
| -rw-r--r-- | gc/gc_impl.h | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -626,7 +626,7 @@ typedef struct gc_function_map { // Finalizers void (*make_zombie)(void *objspace_ptr, VALUE obj, void (*dfree)(void *), void *data); VALUE (*define_finalizer)(void *objspace_ptr, VALUE obj, VALUE block); - VALUE (*undefine_finalizer)(void *objspace_ptr, VALUE obj); + void (*undefine_finalizer)(void *objspace_ptr, VALUE obj); void (*copy_finalizer)(void *objspace_ptr, VALUE dest, VALUE obj); void (*shutdown_call_finalizer)(void *objspace_ptr); // Object ID @@ -1448,7 +1448,9 @@ os_each_obj(int argc, VALUE *argv, VALUE os) static VALUE undefine_final(VALUE os, VALUE obj) { - return rb_gc_impl_undefine_finalizer(rb_gc_get_objspace(), obj); + rb_gc_impl_undefine_finalizer(rb_gc_get_objspace(), obj); + + return obj; } static void diff --git a/gc/default.c b/gc/default.c index 59890d03be..e5662fc586 100644 --- a/gc/default.c +++ b/gc/default.c @@ -3001,7 +3001,7 @@ rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block) return block; } -VALUE +void rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj) { rb_objspace_t *objspace = objspace_ptr; @@ -3009,7 +3009,6 @@ rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj) rb_check_frozen(obj); st_delete(finalizer_table, &data, 0); FL_UNSET(obj, FL_FINALIZE); - return obj; } VALUE diff --git a/gc/gc_impl.h b/gc/gc_impl.h index ab21e4e81b..18249dc58b 100644 --- a/gc/gc_impl.h +++ b/gc/gc_impl.h @@ -58,7 +58,7 @@ void rb_gc_impl_each_object(void *objspace_ptr, void (*func)(VALUE obj, void *da // Finalizers void rb_gc_impl_make_zombie(void *objspace_ptr, VALUE obj, void (*dfree)(void *), void *data); VALUE rb_gc_impl_define_finalizer(void *objspace_ptr, VALUE obj, VALUE block); -VALUE rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj); +void rb_gc_impl_undefine_finalizer(void *objspace_ptr, VALUE obj); void rb_gc_impl_copy_finalizer(void *objspace_ptr, VALUE dest, VALUE obj); void rb_gc_impl_shutdown_call_finalizer(void *objspace_ptr); // Object ID |