From ed130faf2878c383cab52fa5ed887837e04f303d Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 10 Mar 2015 18:50:15 +0000 Subject: * proc.c: use RUBY_VM_IFUNC_P() to recognize IFUNC or not. * vm.c: ditto. * vm_dump.c: ditto. * vm_insnhelper.c: ditto. * vm_core.h: use RB_TYPE_P() instead of BUILTIN_TYPE(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- proc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'proc.c') diff --git a/proc.c b/proc.c index 25327af6f3..c3ce56432a 100644 --- a/proc.c +++ b/proc.c @@ -722,7 +722,7 @@ proc_call(int argc, VALUE *argv, VALUE procval) GetProcPtr(procval, proc); iseq = proc->block.iseq; - if (BUILTIN_TYPE(iseq) == T_NODE || iseq->param.flags.has_block) { + if (RUBY_VM_IFUNC_P(iseq) || iseq->param.flags.has_block) { if (rb_block_given_p()) { rb_proc_t *passed_proc; RB_GC_GUARD(passed_procval) = rb_block_proc(); @@ -846,7 +846,7 @@ rb_block_min_max_arity(rb_block_t *block, int *max) { rb_iseq_t *iseq = block->iseq; if (iseq) { - if (BUILTIN_TYPE(iseq) != T_NODE) { + if (!RUBY_VM_IFUNC_P(iseq)) { return rb_iseq_min_max_arity(iseq, max); } else { @@ -1685,7 +1685,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod) rb_proc_t *proc; body = proc_dup(body); GetProcPtr(body, proc); - if (BUILTIN_TYPE(proc->block.iseq) != T_NODE) { + if (!RUBY_VM_IFUNC_P(proc->block.iseq)) { proc->block.iseq->defined_method_id = id; RB_OBJ_WRITE(proc->block.iseq->self, &proc->block.iseq->klass, mod); proc->is_lambda = TRUE; @@ -2464,7 +2464,7 @@ proc_binding(VALUE self) GetProcPtr(self, proc); iseq = proc->block.iseq; - if (RB_TYPE_P((VALUE)iseq, T_NODE)) { + if (RUBY_VM_IFUNC_P(iseq)) { if (!IS_METHOD_PROC_NODE((NODE *)iseq)) { rb_raise(rb_eArgError, "Can't create Binding from C level Proc"); } -- cgit v1.2.3