From b4f551686b973b03665bcaa3ecf128c0a87ff58b Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Tue, 21 Nov 2023 12:09:13 +0100 Subject: [PATCH] Get rid of useless dsize functions If we always return 0, we might as well not define the function at all. --- compile.c | 12 +++++------- proc.c | 8 +------- time.c | 12 +++++------- vm_backtrace.c | 25 +++++++++++-------------- 4 files changed, 22 insertions(+), 35 deletions(-) diff --git a/compile.c b/compile.c index 66eabedd1a..24086730da 100644 --- a/compile.c +++ b/compile.c @@ -11146,15 +11146,13 @@ pinned_list_mark(void *ptr) } } -static size_t -pinned_list_memsize(const void *ptr) -{ - return 0; -} - static const rb_data_type_t pinned_list_type = { "pinned_list", - {pinned_list_mark, RUBY_DEFAULT_FREE, pinned_list_memsize,}, + { + pinned_list_mark, + RUBY_DEFAULT_FREE, + NULL, // No external memory to report, + }, 0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE }; diff --git a/proc.c b/proc.c index 4df4269c1b..475879f9d5 100644 --- a/proc.c +++ b/proc.c @@ -1597,18 +1597,12 @@ bm_mark_and_move(void *ptr) rb_gc_mark_and_move_ptr((rb_method_entry_t **)&data->me); } -static size_t -bm_memsize(const void *ptr) -{ - return 0; -} - static const rb_data_type_t method_data_type = { "method", { bm_mark_and_move, RUBY_TYPED_DEFAULT_FREE, - bm_memsize, + NULL, // No external memory to report, bm_mark_and_move, }, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE diff --git a/time.c b/time.c index 3a50fb4318..5dc0b2d4e6 100644 --- a/time.c +++ b/time.c @@ -1841,15 +1841,13 @@ time_mark(void *ptr) rb_gc_mark(tobj->vtm.zone); } -static size_t -time_memsize(const void *tobj) -{ - return 0; -} - static const rb_data_type_t time_data_type = { "time", - {time_mark, RUBY_TYPED_DEFAULT_FREE, time_memsize,}, + { + time_mark, + RUBY_TYPED_DEFAULT_FREE, + NULL, // No external memory to report, + }, 0, 0, (RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE), }; diff --git a/vm_backtrace.c b/vm_backtrace.c index c411a4b08b..0d55eae042 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -159,15 +159,13 @@ location_mark_entry(rb_backtrace_location_t *fi) } } -static size_t -location_memsize(const void *ptr) -{ - return 0; -} - static const rb_data_type_t location_data_type = { "frame_info", - {location_mark, RUBY_TYPED_DEFAULT_FREE, location_memsize,}, + { + location_mark, + RUBY_TYPED_DEFAULT_FREE, + NULL, // No external memory to report, + }, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE }; @@ -503,15 +501,14 @@ backtrace_update(void *ptr) bt->locary = rb_gc_location(bt->locary); } -static size_t -backtrace_memsize(const void *ptr) -{ - return 0; -} - static const rb_data_type_t backtrace_data_type = { "backtrace", - {backtrace_mark, RUBY_DEFAULT_FREE, backtrace_memsize, backtrace_update}, + { + backtrace_mark, + RUBY_DEFAULT_FREE, + NULL, // No external memory to report, + backtrace_update, + }, 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_EMBEDDABLE };