From ceece4650a1de6189f2705cbf8120f6679a1af8f Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 20 Aug 2012 11:36:34 +0000 Subject: vm_insnhelper.c: iclass as klass in cfp * vm_insnhelper.c (vm_call_method): follow iclasses as klass in cfp but not included modules. [ruby-core:47241] [Bug #6891] * vm_insnhelper.c (vm_call_bmethod): pass defined_class to follow proper ancestors. [ruby-core:47241] [Bug #6891] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- proc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'proc.c') diff --git a/proc.c b/proc.c index 9ed6dbb2e7..753464bc32 100644 --- a/proc.c +++ b/proc.c @@ -558,8 +558,7 @@ proc_call(int argc, VALUE *argv, VALUE procval) } } - vret = rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, - argc, argv, blockptr); + vret = rb_vm_invoke_proc(GET_THREAD(), proc, argc, argv, blockptr); RB_GC_GUARD(procval); return vret; } @@ -584,7 +583,7 @@ rb_proc_call(VALUE self, VALUE args) VALUE vret; rb_proc_t *proc; GetProcPtr(self, proc); - vret = rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, + vret = rb_vm_invoke_proc(GET_THREAD(), proc, check_argc(RARRAY_LEN(args)), RARRAY_PTR(args), 0); RB_GC_GUARD(self); RB_GC_GUARD(args); @@ -605,8 +604,7 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval) block = &pass_proc->block; } - vret = rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, - argc, argv, block); + vret = rb_vm_invoke_proc(GET_THREAD(), proc, argc, argv, block); RB_GC_GUARD(self); RB_GC_GUARD(pass_procval); return vret; -- cgit v1.2.3