diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-22 15:40:37 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-22 15:40:37 +0000 |
| commit | ceab943d087a8049b5ed72a77e88d151c1183e9a (patch) | |
| tree | bc3ad783d2c3dc65d9dc52653c8e00cd662e0aef /vm_insnhelper.c | |
| parent | 74eb4cab63025f098902a7a1419830d301801f50 (diff) | |
merge revision(s) 51651,51655: [Backport #11451]
* vm_insnhelper.c (vm_invoke_block): we should not expect ci->argc is
stable after invoking a block. [Bug #11451]
* test/ruby/test_yield.rb: add a test. This test script is given by
Alex Dowad.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index b40ebe1814..fae13e82c3 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2094,10 +2094,11 @@ vm_invoke_block(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *ci } else { VALUE val; + int argc; CALLER_SETUP_ARG(th->cfp, ci); - val = vm_yield_with_cfunc(th, block, block->self, block->klass, - ci->argc, STACK_ADDR_FROM_TOP(ci->argc), 0); - POPN(ci->argc); /* TODO: should put before C/yield? */ + argc = ci->argc; + val = vm_yield_with_cfunc(th, block, block->self, block->klass, argc, STACK_ADDR_FROM_TOP(argc), 0); + POPN(argc); /* TODO: should put before C/yield? */ return val; } } |