ruby-changes:5532
From: wanabe <ko1@a...>
Date: Mon, 9 Jun 2008 08:17:02 +0900 (JST)
Subject: [ruby-changes:5532] Ruby:r17035 (trunk): * vm_insnhelper.c, vm.c, proc.c : revert r17021.
wanabe 2008-06-09 08:16:46 +0900 (Mon, 09 Jun 2008) New Revision: 17035 Modified files: trunk/ChangeLog trunk/proc.c trunk/vm.c trunk/vm_insnhelper.c Log: * vm_insnhelper.c, vm.c, proc.c : revert r17021. [ruby-dev:34997] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17035&r2=17034&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/proc.c?r1=17035&r2=17034&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm.c?r1=17035&r2=17034&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm_insnhelper.c?r1=17035&r2=17034&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 17034) +++ ChangeLog (revision 17035) @@ -1,3 +1,7 @@ +Mon Jun 9 08:12:40 2008 wanabe <s.wanabe@g...> + + * vm_insnhelper.c, vm.c, proc.c : revert r17021. [ruby-dev:34997] + Mon Jun 9 03:12:23 2008 Koichi Sasada <ko1@a...> * bootstraptest/pending.rb: move/remove solved issues. Index: proc.c =================================================================== --- proc.c (revision 17034) +++ proc.c (revision 17035) @@ -490,7 +490,7 @@ rb_block_t *blockptr = 0; GetProcPtr(procval, proc); - if (BUILTIN_TYPE(proc->block.iseq) == T_NODE || + if (BUILTIN_TYPE(proc->block.iseq) != T_NODE && proc->block.iseq->arg_block != -1) { if (rb_block_given_p()) { @@ -1613,7 +1613,7 @@ arity = make_curry_proc(proc, passed, arity); return arity; } - arity = proc_call(RARRAY_LEN(passed), RARRAY_PTR(passed), proc); + arity = rb_proc_call(proc, passed); return arity; } Index: vm.c =================================================================== --- vm.c (revision 17034) +++ vm.c (revision 17035) @@ -448,7 +448,7 @@ return vm_eval_body(th); } else { - return vm_yield_with_cfunc(th, block, self, argc, argv, blockptr); + return vm_yield_with_cfunc(th, block, self, argc, argv); } } Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 17034) +++ vm_insnhelper.c (revision 17035) @@ -651,8 +651,7 @@ static inline VALUE vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, - VALUE self, int argc, const VALUE *argv, - rb_block_t *blockptr) + VALUE self, int argc, const VALUE *argv) { NODE *ifunc = (NODE *) block->iseq; VALUE val; @@ -673,15 +672,7 @@ self, (VALUE)block->dfp, 0, th->cfp->sp, block->lfp, 1); - if (blockptr) { - VALUE store_block = th->cfp->lfp[0]; - th->cfp->lfp[0] = GC_GUARDED_PTR(blockptr); - val = (*ifunc->nd_cfnc) (arg, ifunc->nd_tval, argc, argv); - th->cfp->lfp[0] = store_block; - } - else { - val = (*ifunc->nd_cfnc) (arg, ifunc->nd_tval, argc, argv); - } + val = (*ifunc->nd_cfnc) (arg, ifunc->nd_tval, argc, argv); th->cfp++; return val; @@ -840,7 +831,7 @@ return Qundef; } else { - VALUE val = vm_yield_with_cfunc(th, block, block->self, argc, STACK_ADDR_FROM_TOP(argc), 0); + VALUE val = vm_yield_with_cfunc(th, block, block->self, argc, STACK_ADDR_FROM_TOP(argc)); POPN(argc); /* TODO: should put before C/yield? */ return val; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/