From 2296b877d800bfeafb59df7e60c7eddd8f0a2ae3 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 31 Jan 2023 13:30:50 -0500 Subject: [PATCH] Remove rb_hash_st_table It's a duplicate of RHASH_ST_TABLE. --- hash.c | 7 ------- internal/hash.h | 1 - ractor.c | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hash.c b/hash.c index e08885287f..56080a01df 100644 --- a/hash.c +++ b/hash.c @@ -579,13 +579,6 @@ rb_hash_ar_table_p(VALUE hash) } } -st_table * -rb_hash_st_table(VALUE hash) -{ - HASH_ASSERT(!RHASH_AR_TABLE_P(hash)); - return RHASH(hash)->as.st; -} - void rb_hash_st_table_set(VALUE hash, st_table *st) { diff --git a/internal/hash.h b/internal/hash.h index 1c9e4e170a..5545ecb855 100644 --- a/internal/hash.h +++ b/internal/hash.h @@ -82,7 +82,6 @@ VALUE rb_hash_set_pair(VALUE hash, VALUE pair); int rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval); int rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg); int rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func *func, st_data_t arg); -extern st_table *rb_hash_st_table(VALUE hash); VALUE rb_ident_hash_new_with_size(st_index_t size); static inline unsigned RHASH_AR_TABLE_SIZE_RAW(VALUE h); diff --git a/ractor.c b/ractor.c index e608e4e232..401904432e 100644 --- a/ractor.c +++ b/ractor.c @@ -2278,7 +2278,7 @@ obj_traverse_rec(struct obj_traverse_data *data) { if (UNLIKELY(!data->rec)) { data->rec_hash = rb_ident_hash_new(); - data->rec = rb_hash_st_table(data->rec_hash); + data->rec = RHASH_ST_TABLE(data->rec_hash); } return data->rec; } @@ -2710,7 +2710,7 @@ obj_traverse_replace_rec(struct obj_traverse_replace_data *data) { if (UNLIKELY(!data->rec)) { data->rec_hash = rb_ident_hash_new(); - data->rec = rb_hash_st_table(data->rec_hash); + data->rec = RHASH_ST_TABLE(data->rec_hash); } return data->rec; }