aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cont.c6
-rw-r--r--gc.c4
-rw-r--r--gc.h2
-rw-r--r--include/ruby/intern.h2
-rw-r--r--iseq.c16
-rw-r--r--proc.c10
-rw-r--r--variable.c8
-rw-r--r--vm.c8
8 files changed, 28 insertions, 28 deletions
diff --git a/cont.c b/cont.c
index 8e76ae1393..ae99a34531 100644
--- a/cont.c
+++ b/cont.c
@@ -858,7 +858,7 @@ cont_mark(void *ptr)
rb_context_t *cont = ptr;
RUBY_MARK_ENTER("cont");
- rb_gc_mark_no_pin(cont->value);
+ rb_gc_mark_movable(cont->value);
rb_execution_context_mark(&cont->saved_ec);
rb_gc_mark(cont_thread_value(cont));
@@ -967,7 +967,7 @@ void
rb_fiber_mark_self(const rb_fiber_t *fiber)
{
if (fiber->cont.self) {
- rb_gc_mark_no_pin(fiber->cont.self);
+ rb_gc_mark_movable(fiber->cont.self);
}
else {
rb_execution_context_mark(&fiber->cont.saved_ec);
@@ -992,7 +992,7 @@ fiber_mark(void *ptr)
rb_fiber_t *fiber = ptr;
RUBY_MARK_ENTER("cont");
fiber_verify(fiber);
- rb_gc_mark_no_pin(fiber->first_proc);
+ rb_gc_mark_movable(fiber->first_proc);
if (fiber->prev) rb_fiber_mark_self(fiber->prev);
cont_mark(&fiber->cont);
RUBY_MARK_LEAVE("cont");
diff --git a/gc.c b/gc.c
index 1ac39bbfbf..0eb3a233e5 100644
--- a/gc.c
+++ b/gc.c
@@ -4984,7 +4984,7 @@ gc_mark(rb_objspace_t *objspace, VALUE obj)
}
void
-rb_gc_mark_no_pin(VALUE ptr)
+rb_gc_mark_movable(VALUE ptr)
{
gc_mark(&rb_objspace, ptr);
}
@@ -10145,7 +10145,7 @@ wmap_mark(void *ptr)
#if WMAP_DELETE_DEAD_OBJECT_IN_MARK
if (w->obj2wmap) st_foreach(w->obj2wmap, wmap_mark_map, (st_data_t)&rb_objspace);
#endif
- rb_gc_mark_no_pin(w->final);
+ rb_gc_mark_movable(w->final);
}
static int
diff --git a/gc.h b/gc.h
index 0e7ffba9f1..7c7f0efd1b 100644
--- a/gc.h
+++ b/gc.h
@@ -59,7 +59,7 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
#define RUBY_MARK_NO_PIN_UNLESS_NULL(ptr) do { \
VALUE markobj = (ptr); \
- if (RTEST(markobj)) {rb_gc_mark_no_pin(markobj);} \
+ if (RTEST(markobj)) {rb_gc_mark_movable(markobj);} \
} while (0)
#define RUBY_MARK_UNLESS_NULL(ptr) do { \
VALUE markobj = (ptr); \
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 63fce40585..9f8462ef13 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -515,7 +515,7 @@ void rb_mark_hash(struct st_table*);
void rb_update_st_references(struct st_table *ht);
void rb_gc_mark_maybe(VALUE);
void rb_gc_mark(VALUE);
-void rb_gc_mark_no_pin(VALUE);
+void rb_gc_mark_movable(VALUE);
VALUE rb_gc_location(VALUE);
void rb_gc_force_recycle(VALUE);
void rb_gc(void);
diff --git a/iseq.c b/iseq.c
index bbf35c4884..7f1e2203cb 100644
--- a/iseq.c
+++ b/iseq.c
@@ -271,7 +271,7 @@ rb_iseq_update_references(rb_iseq_t *iseq)
static VALUE
each_insn_value(void *ctx, VALUE obj)
{
- rb_gc_mark_no_pin(obj);
+ rb_gc_mark_movable(obj);
return obj;
}
@@ -289,11 +289,11 @@ rb_iseq_mark(const rb_iseq_t *iseq)
rb_iseq_each_value(iseq, each_insn_value, NULL);
}
- rb_gc_mark_no_pin(body->variable.coverage);
- rb_gc_mark_no_pin(body->variable.pc2branchindex);
- rb_gc_mark_no_pin(body->location.label);
- rb_gc_mark_no_pin(body->location.base_label);
- rb_gc_mark_no_pin(body->location.pathobj);
+ rb_gc_mark_movable(body->variable.coverage);
+ rb_gc_mark_movable(body->variable.pc2branchindex);
+ rb_gc_mark_movable(body->location.label);
+ rb_gc_mark_movable(body->location.base_label);
+ rb_gc_mark_movable(body->location.pathobj);
RUBY_MARK_NO_PIN_UNLESS_NULL((VALUE)body->parent_iseq);
if (body->param.flags.has_kw && ISEQ_COMPILE_DATA(iseq) == NULL) {
@@ -305,7 +305,7 @@ rb_iseq_mark(const rb_iseq_t *iseq)
for (j = 0; i < keyword->num; i++, j++) {
VALUE obj = keyword->default_values[j];
if (!SPECIAL_CONST_P(obj)) {
- rb_gc_mark_no_pin(obj);
+ rb_gc_mark_movable(obj);
}
}
}
@@ -317,7 +317,7 @@ rb_iseq_mark(const rb_iseq_t *iseq)
const struct iseq_catch_table_entry *entry;
entry = UNALIGNED_MEMBER_PTR(table, entries[i]);
if (entry->iseq) {
- rb_gc_mark_no_pin((VALUE)entry->iseq);
+ rb_gc_mark_movable((VALUE)entry->iseq);
}
}
}
diff --git a/proc.c b/proc.c
index 2d931e77f0..5957cc3c7b 100644
--- a/proc.c
+++ b/proc.c
@@ -297,7 +297,7 @@ binding_mark(void *ptr)
RUBY_MARK_ENTER("binding");
block_mark(&bind->block);
- rb_gc_mark_no_pin(bind->pathobj);
+ rb_gc_mark_movable(bind->pathobj);
RUBY_MARK_LEAVE("binding");
}
@@ -1363,10 +1363,10 @@ static void
bm_mark(void *ptr)
{
struct METHOD *data = ptr;
- rb_gc_mark_no_pin(data->recv);
- rb_gc_mark_no_pin(data->klass);
- rb_gc_mark_no_pin(data->iclass);
- rb_gc_mark_no_pin((VALUE)data->me);
+ rb_gc_mark_movable(data->recv);
+ rb_gc_mark_movable(data->klass);
+ rb_gc_mark_movable(data->iclass);
+ rb_gc_mark_movable((VALUE)data->me);
}
static void
diff --git a/variable.c b/variable.c
index b839f3067b..69e2671be0 100644
--- a/variable.c
+++ b/variable.c
@@ -1896,7 +1896,7 @@ autoload_i_mark(void *ptr)
{
struct autoload_data_i *p = ptr;
- rb_gc_mark_no_pin(p->feature);
+ rb_gc_mark_movable(p->feature);
/* allow GC to free us if no modules refer to this via autoload_const.ad */
if (list_empty(&p->constants)) {
@@ -1942,9 +1942,9 @@ autoload_c_mark(void *ptr)
{
struct autoload_const *ac = ptr;
- rb_gc_mark_no_pin(ac->mod);
- rb_gc_mark_no_pin(ac->ad);
- rb_gc_mark_no_pin(ac->value);
+ rb_gc_mark_movable(ac->mod);
+ rb_gc_mark_movable(ac->ad);
+ rb_gc_mark_movable(ac->value);
}
static void
diff --git a/vm.c b/vm.c
index 3fa0b16f5b..e8e436bd80 100644
--- a/vm.c
+++ b/vm.c
@@ -2481,14 +2481,14 @@ rb_execution_context_mark(const rb_execution_context_t *ec)
while (cfp != limit_cfp) {
const VALUE *ep = cfp->ep;
VM_ASSERT(!!VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED) == vm_ep_in_heap_p_(ec, ep));
- rb_gc_mark_no_pin(cfp->self);
- rb_gc_mark_no_pin((VALUE)cfp->iseq);
- rb_gc_mark_no_pin((VALUE)cfp->block_code);
+ rb_gc_mark_movable(cfp->self);
+ rb_gc_mark_movable((VALUE)cfp->iseq);
+ rb_gc_mark_movable((VALUE)cfp->block_code);
if (!VM_ENV_LOCAL_P(ep)) {
const VALUE *prev_ep = VM_ENV_PREV_EP(ep);
if (VM_ENV_FLAGS(prev_ep, VM_ENV_FLAG_ESCAPED)) {
- rb_gc_mark_no_pin(prev_ep[VM_ENV_DATA_INDEX_ENV]);
+ rb_gc_mark_movable(prev_ep[VM_ENV_DATA_INDEX_ENV]);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-12 11:26:15 +0000