aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zhu <peter@peterzhu.ca>2023-02-08 12:43:25 -0500
committerPeter Zhu <peter@peterzhu.ca>2023-02-08 12:43:25 -0500
commit861d70e3839856fb27f488755752e06f9183efba (patch)
tree6684321bd6ad8ae7d539dfbbffdf18fa2b339e85
parent6aa196149a479c2d8dd415dfd0d044ec1d3fd7df (diff)
downloadruby-861d70e3839856fb27f488755752e06f9183efba.tar.gz
Rename iseq_mark_and_update to iseq_mark_and_move
The new name is more consistent.
-rw-r--r--compile.c2
-rw-r--r--gc.c6
-rw-r--r--iseq.c4
-rw-r--r--iseq.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/compile.c b/compile.c
index 997ec75dfb..52b01d14b7 100644
--- a/compile.c
+++ b/compile.c
@@ -10736,7 +10736,7 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
}
void
-rb_iseq_mark_and_update_insn_storage(struct iseq_compile_data_storage *storage)
+rb_iseq_mark_and_move_insn_storage(struct iseq_compile_data_storage *storage)
{
INSN *iobj = 0;
size_t size = sizeof(INSN);
diff --git a/gc.c b/gc.c
index ef25a2d40c..4a2078bdb7 100644
--- a/gc.c
+++ b/gc.c
@@ -1211,7 +1211,7 @@ VALUE rb_mGC;
int ruby_disable_gc = 0;
int ruby_enable_autocompact = 0;
-void rb_iseq_mark_and_update(rb_iseq_t *iseq, bool referece_updating);
+void rb_iseq_mark_and_move(rb_iseq_t *iseq, bool referece_updating);
void rb_iseq_free(const rb_iseq_t *iseq);
size_t rb_iseq_memsize(const rb_iseq_t *iseq);
void rb_vm_update_references(void *ptr);
@@ -7188,7 +7188,7 @@ gc_mark_imemo(rb_objspace_t *objspace, VALUE obj)
mark_method_entry(objspace, &RANY(obj)->as.imemo.ment);
return;
case imemo_iseq:
- rb_iseq_mark_and_update((rb_iseq_t *)obj, false);
+ rb_iseq_mark_and_move((rb_iseq_t *)obj, false);
return;
case imemo_tmpbuf:
{
@@ -10345,7 +10345,7 @@ gc_ref_update_imemo(rb_objspace_t *objspace, VALUE obj)
gc_ref_update_method_entry(objspace, &RANY(obj)->as.imemo.ment);
break;
case imemo_iseq:
- rb_iseq_mark_and_update((rb_iseq_t *)obj, true);
+ rb_iseq_mark_and_move((rb_iseq_t *)obj, true);
break;
case imemo_ast:
rb_ast_update_references((rb_ast_t *)obj);
diff --git a/iseq.c b/iseq.c
index 50eb005c0a..3993630f7d 100644
--- a/iseq.c
+++ b/iseq.c
@@ -283,7 +283,7 @@ rb_iseq_mark_and_move_each_value(const rb_iseq_t *iseq, VALUE *original_iseq)
}
void
-rb_iseq_mark_and_update(rb_iseq_t *iseq, bool reference_updating)
+rb_iseq_mark_and_move(rb_iseq_t *iseq, bool reference_updating)
{
RUBY_MARK_ENTER("iseq");
@@ -379,7 +379,7 @@ rb_iseq_mark_and_update(rb_iseq_t *iseq, bool reference_updating)
else if (FL_TEST_RAW((VALUE)iseq, ISEQ_USE_COMPILE_DATA)) {
const struct iseq_compile_data *const compile_data = ISEQ_COMPILE_DATA(iseq);
- rb_iseq_mark_and_update_insn_storage(compile_data->insn.storage_head);
+ rb_iseq_mark_and_move_insn_storage(compile_data->insn.storage_head);
rb_gc_mark_and_move((VALUE *)&compile_data->err_info);
rb_gc_mark_and_move((VALUE *)&compile_data->catch_table_ary);
diff --git a/iseq.h b/iseq.h
index 5ddbf8df7d..fafa5a518e 100644
--- a/iseq.h
+++ b/iseq.h
@@ -186,7 +186,7 @@ VALUE *rb_iseq_original_iseq(const rb_iseq_t *iseq);
void rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc,
VALUE locals, VALUE args,
VALUE exception, VALUE body);
-void rb_iseq_mark_and_update_insn_storage(struct iseq_compile_data_storage *arena);
+void rb_iseq_mark_and_move_insn_storage(struct iseq_compile_data_storage *arena);
VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
VALUE rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc);