From 33dce13d18b18def36165d827626e7371320354d Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 17 Dec 2008 06:15:55 +0000 Subject: merges r20748 from trunk into ruby_1_9_1. * vm_insnhelper.c (vm_callee_setup_arg_complex): uses cfp from blockptr instead of the current cfp. [ruby-core:20544] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 39b379429f..a57c087c6f 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -186,7 +186,8 @@ vm_callee_setup_arg_complex(rb_thread_t *th, const rb_iseq_t * iseq, if (blockptr->proc == 0) { rb_proc_t *proc; - blockval = vm_make_proc(th, th->cfp, blockptr, rb_cProc); + blockval = vm_make_proc(th, RUBY_VM_GET_CFP_FROM_BLOCK_PTR(blockptr), + blockptr, rb_cProc); GetProcPtr(blockval, proc); *block = &proc->block; -- cgit v1.2.3