From 4526fc23036557bfc622012fd1818ad6a5107154 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 24 Dec 2008 12:56:58 +0000 Subject: * vm.c (invoke_block_from_c): fix to point right cfp. * vm.c (vm_make_proc, vm_make_proc_from_block), vm_core.h: remove unused parameter cfp. * vm_insnhelper.c, proc.c (proc_new): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 749832c29..46c11a6de 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -185,10 +185,7 @@ vm_callee_setup_arg_complex(rb_thread_t *th, const rb_iseq_t * iseq, /* make Proc object */ if (blockptr->proc == 0) { rb_proc_t *proc; - - blockval = vm_make_proc(th, RUBY_VM_GET_CFP_FROM_BLOCK_PTR(blockptr), - blockptr, rb_cProc); - + blockval = vm_make_proc(th, blockptr, rb_cProc); GetProcPtr(blockval, proc); *block = &proc->block; } @@ -664,7 +661,7 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, } if (blockptr) { - blockarg = vm_make_proc(th, th->cfp, blockptr, rb_cProc); + blockarg = vm_make_proc(th, blockptr, rb_cProc); } else { blockarg = Qnil; -- cgit