From 432162d4b848ef0874e7c44dd6fbc4794dcbb92c Mon Sep 17 00:00:00 2001 From: normal Date: Wed, 15 Jul 2015 09:32:08 +0000 Subject: remove redundant NULL checks after RUBY_VM_IFUNC_P * proc.c (proc_mark): remove redundant check * vm.c (env_mark): ditto This doesn't change object code size, but the unstripped executable is smaller and the code less confusing. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ proc.c | 2 +- vm.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6958b0da17..e50886e192 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 15 18:31:18 2015 Eric Wong + + * proc.c (proc_mark): remove redundant check + * vm.c (env_mark): ditto + Wed Jul 15 17:27:40 2015 Eric Wong * iseq.c (iseq_mark): remove check for data pointer diff --git a/proc.c b/proc.c index 1e8c117ff1..76a004dca1 100644 --- a/proc.c +++ b/proc.c @@ -50,7 +50,7 @@ proc_mark(void *ptr) RUBY_MARK_UNLESS_NULL(proc->block.self); RUBY_MARK_UNLESS_NULL(rb_vm_proc_envval(proc)); if (proc->block.iseq && RUBY_VM_IFUNC_P(proc->block.iseq)) { - RUBY_MARK_UNLESS_NULL((VALUE)(proc->block.iseq)); + rb_gc_mark((VALUE)(proc->block.iseq)); } RUBY_MARK_LEAVE("proc"); } diff --git a/vm.c b/vm.c index b2b87f8eb5..797333591c 100644 --- a/vm.c +++ b/vm.c @@ -422,7 +422,7 @@ env_mark(void * const ptr) if (env->block.iseq) { if (RUBY_VM_IFUNC_P(env->block.iseq)) { - RUBY_MARK_UNLESS_NULL((VALUE)env->block.iseq); + rb_gc_mark((VALUE)env->block.iseq); } else { RUBY_MARK_UNLESS_NULL(env->block.iseq->self); -- cgit v1.2.3