aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <tenderlove@ruby-lang.org>2019-11-06 16:29:09 -0800
committerAaron Patterson <tenderlove@ruby-lang.org>2019-11-06 16:31:55 -0800
commitd0d743ad4558a572769f0f11ece11fda068652b3 (patch)
tree0d9958dc912561b3249d23696dfb04a50439a7d5
parente58814d150b0652f5e11958b36b85d977fdd0426 (diff)
downloadruby-d0d743ad4558a572769f0f11ece11fda068652b3.tar.gz
Remove duplicate code
These functions are the same, so remove one. Co-authored-by: John Hawthorn <john@hawthorn.email>
-rw-r--r--gc.c6
-rw-r--r--include/ruby/intern.h3
-rw-r--r--vm.c2
3 files changed, 2 insertions, 9 deletions
diff --git a/gc.c b/gc.c
index 5a4f72d9ff..cee8f6cbdf 100644
--- a/gc.c
+++ b/gc.c
@@ -7995,12 +7995,6 @@ gc_ref_update_hash(rb_objspace_t * objspace, VALUE v)
rb_hash_stlike_foreach_with_replace(v, hash_foreach_replace, hash_replace_ref, (st_data_t)objspace);
}
-void rb_update_st_references(struct st_table *ht)
-{
- rb_objspace_t *objspace = &rb_objspace;
- gc_update_table_refs(objspace, ht);
-}
-
static void
gc_ref_update_method_entry(rb_objspace_t *objspace, rb_method_entry_t *me)
{
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index b9471a7097..e53b4e607c 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -532,10 +532,9 @@ PUREFUNC(int rb_during_gc(void));
void rb_gc_mark_locations(const VALUE*, const VALUE*);
void rb_mark_tbl(struct st_table*);
void rb_mark_tbl_no_pin(struct st_table*);
-void rb_gc_update_tbl_refs(st_table *ptr);
void rb_mark_set(struct st_table*);
void rb_mark_hash(struct st_table*);
-void rb_update_st_references(struct st_table *ht);
+void rb_gc_update_tbl_refs(st_table *ptr);
void rb_gc_mark_maybe(VALUE);
void rb_gc_mark(VALUE);
void rb_gc_mark_movable(VALUE);
diff --git a/vm.c b/vm.c
index 9f024895c5..ed02a71a48 100644
--- a/vm.c
+++ b/vm.c
@@ -2220,7 +2220,7 @@ rb_vm_update_references(void *ptr)
{
if (ptr) {
rb_vm_t *vm = ptr;
- rb_update_st_references(vm->frozen_strings);
+ rb_gc_update_tbl_refs(vm->frozen_strings);
}
}