1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use rb_gc_mark_and_move for proc and binding

Browse Source 
Also makes VM_ENV_ENVVAL movable.
This commit is contained in:
Peter Zhu 2023-02-03 16:25:34 -05:00
parent 8fc69a0a7e
commit df2e36aeeb
Notes: git 2023-02-07 13:40:08 +00:00 
Merged: https://github.com/ruby/ruby/pull/7245
1 changed files with 17 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
proc.c
View File

@ -80,62 +80,34 @@ CLONESETUP(VALUE clone, VALUE obj)
} }
static void static void
block_mark(const struct rb_block *block) block_mark_and_move(struct rb_block *block)
{
switch (vm_block_type(block)) {
case block_type_iseq:
case block_type_ifunc:
{
const struct rb_captured_block *captured = &block->as.captured;
RUBY_MARK_MOVABLE_UNLESS_NULL(captured->self);
RUBY_MARK_MOVABLE_UNLESS_NULL((VALUE)captured->code.val);
if (captured->ep && !UNDEF_P(captured->ep[VM_ENV_DATA_INDEX_ENV]) /* cfunc_proc_t */) {
rb_gc_mark(VM_ENV_ENVVAL(captured->ep));
}
}
break;
case block_type_symbol:
RUBY_MARK_MOVABLE_UNLESS_NULL(block->as.symbol);
break;
case block_type_proc:
RUBY_MARK_MOVABLE_UNLESS_NULL(block->as.proc);
break;
}
}
static void
block_compact(struct rb_block *block)
{ {
switch (block->type) { switch (block->type) {
case block_type_iseq: case block_type_iseq:
case block_type_ifunc: case block_type_ifunc:
{ {
struct rb_captured_block *captured = &block->as.captured; struct rb_captured_block *captured = &block->as.captured;
captured->self = rb_gc_location(captured->self); rb_gc_mark_and_move(&captured->self);
captured->code.val = rb_gc_location(captured->code.val); rb_gc_mark_and_move(&captured->code.val);
if (captured->ep) {
rb_gc_mark_and_move((VALUE *)&captured->ep[VM_ENV_DATA_INDEX_ENV]);
}
} }
break; break;
case block_type_symbol: case block_type_symbol:
block->as.symbol = rb_gc_location(block->as.symbol); rb_gc_mark_and_move(&block->as.symbol);
break; break;
case block_type_proc: case block_type_proc:
block->as.proc = rb_gc_location(block->as.proc); rb_gc_mark_and_move(&block->as.proc);
break; break;
} }
} }
static void static void
proc_compact(void *ptr) proc_mark_and_move(void *ptr)
{ {
rb_proc_t *proc = ptr; rb_proc_t *proc = ptr;
block_compact((struct rb_block *)&proc->block); block_mark_and_move((struct rb_block *)&proc->block);
}
static void
proc_mark(void *ptr)
{
rb_proc_t *proc = ptr;
block_mark(&proc->block);
RUBY_MARK_LEAVE("proc"); RUBY_MARK_LEAVE("proc");
} }
@ -156,10 +128,10 @@ proc_memsize(const void *ptr)
static const rb_data_type_t proc_data_type = { static const rb_data_type_t proc_data_type = {
"proc", "proc",
{ {
proc_mark, proc_mark_and_move,
RUBY_TYPED_DEFAULT_FREE, RUBY_TYPED_DEFAULT_FREE,
proc_memsize, proc_memsize,
proc_compact, proc_mark_and_move,
}, },
0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
}; };
@ -309,25 +281,16 @@ binding_free(void *ptr)
} }
static void static void
binding_mark(void *ptr) binding_mark_and_move(void *ptr)
{ {
rb_binding_t *bind = ptr; rb_binding_t *bind = ptr;
RUBY_MARK_ENTER("binding"); RUBY_MARK_ENTER("binding");
block_mark(&bind->block); block_mark_and_move((struct rb_block *)&bind->block);
rb_gc_mark_movable(bind->pathobj); rb_gc_mark_and_move((VALUE *)&bind->pathobj);
RUBY_MARK_LEAVE("binding"); RUBY_MARK_LEAVE("binding");
} }
static void
binding_compact(void *ptr)
{
rb_binding_t *bind = ptr;
block_compact((struct rb_block *)&bind->block);
UPDATE_REFERENCE(bind->pathobj);
}
static size_t static size_t
binding_memsize(const void *ptr) binding_memsize(const void *ptr)
{ {
@ -337,10 +300,10 @@ binding_memsize(const void *ptr)
const rb_data_type_t ruby_binding_data_type = { const rb_data_type_t ruby_binding_data_type = {
"binding", "binding",
{ {
binding_mark, binding_mark_and_move,
binding_free, binding_free,
binding_memsize, binding_memsize,
binding_compact, binding_mark_and_move,
}, },
0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY 0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
}; };