diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-24 12:56:58 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-24 12:56:58 +0000 |
| commit | f23e8d87c01c751094b58fc13cde1da59ed7eda6 (patch) | |
| tree | 75ffed2aa6e075d19e216d11ab1667dcd62f1e0e /vm_insnhelper.c | |
| parent | 7160543aeb8a9f5d7b2f26d3c7b0d7702016f831 (diff) | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@20969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 749832c297..46c11a6de0 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; |