diff options
author | 0x005c <52650857+0x005c@users.noreply.github.com> | 2020-01-08 20:40:08 +0900 |
---|---|---|
committer | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2020-01-23 00:11:03 +1300 |
commit | 461db352c22c0ffb5c0db295238f97f44168e6cc (patch) | |
tree | 9aca5ef263c3373c57ca4232dc82ddde05947303 | |
parent | c90fc55a1f4630aae862e2d409c933edea3a5d5d (diff) |
Rename RUBY_MARK_NO_PIN_UNLESS_NULL to RUBY_MARK_MOVABLE_UNLESS_NULL
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2823
-rw-r--r-- | gc.h | 2 | ||||
-rw-r--r-- | iseq.c | 2 | ||||
-rw-r--r-- | proc.c | 10 |
3 files changed, 7 insertions, 7 deletions
@@ -59,7 +59,7 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr) #define RUBY_GC_INFO if(0)printf #endif -#define RUBY_MARK_NO_PIN_UNLESS_NULL(ptr) do { \ +#define RUBY_MARK_MOVABLE_UNLESS_NULL(ptr) do { \ VALUE markobj = (ptr); \ if (RTEST(markobj)) {rb_gc_mark_movable(markobj);} \ } while (0) @@ -314,7 +314,7 @@ rb_iseq_mark(const rb_iseq_t *iseq) 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); + RUBY_MARK_MOVABLE_UNLESS_NULL((VALUE)body->parent_iseq); if (body->param.flags.has_kw && ISEQ_COMPILE_DATA(iseq) == NULL) { const struct rb_iseq_param_keyword *const keyword = body->param.keyword; @@ -66,18 +66,18 @@ block_mark(const struct rb_block *block) case block_type_ifunc: { const struct rb_captured_block *captured = &block->as.captured; - RUBY_MARK_NO_PIN_UNLESS_NULL(captured->self); - RUBY_MARK_NO_PIN_UNLESS_NULL((VALUE)captured->code.val); + RUBY_MARK_MOVABLE_UNLESS_NULL(captured->self); + RUBY_MARK_MOVABLE_UNLESS_NULL((VALUE)captured->code.val); if (captured->ep && captured->ep[VM_ENV_DATA_INDEX_ENV] != Qundef /* cfunc_proc_t */) { - RUBY_MARK_NO_PIN_UNLESS_NULL(VM_ENV_ENVVAL(captured->ep)); + RUBY_MARK_MOVABLE_UNLESS_NULL(VM_ENV_ENVVAL(captured->ep)); } } break; case block_type_symbol: - RUBY_MARK_NO_PIN_UNLESS_NULL(block->as.symbol); + RUBY_MARK_MOVABLE_UNLESS_NULL(block->as.symbol); break; case block_type_proc: - RUBY_MARK_NO_PIN_UNLESS_NULL(block->as.proc); + RUBY_MARK_MOVABLE_UNLESS_NULL(block->as.proc); break; } } |