1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm_insnhelper.c: blockparamproxy in rescue

Browse Source 
* vm_insnhelper.c (vm_call_opt_block_call): get block handler from
  the method local frame.  fix segfault at calling the proxy in
  rescue.  http://twitter.com/wannabe53/status/970955247626567680

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-03-06 15:14:22 +00:00
parent 4488a4b927
commit 51c6022040
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/ruby/test_optimization.rb
View File

@ -741,4 +741,16 @@ class TestRubyOptimization < Test::Unit::TestCase
end end
assert_equal(:ok, obj.a()) assert_equal(:ok, obj.a())
end end
def test_blockparam_in_rescue
obj = Object.new
def obj.foo(&b)
raise
rescue
b.call
end
result = nil
assert_equal(42, obj.foo {result = 42})
assert_equal(42, result)
end
end end

2
vm_insnhelper.c
View File

@ -2083,7 +2083,7 @@ vm_call_opt_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct
static VALUE static VALUE
vm_call_opt_block_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc) vm_call_opt_block_call(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc)
{ {
VALUE block_handler = VM_ENV_BLOCK_HANDLER(reg_cfp->ep); VALUE block_handler = VM_ENV_BLOCK_HANDLER(VM_CF_LEP(reg_cfp));
if (BASIC_OP_UNREDEFINED_P(BOP_CALL, PROC_REDEFINED_OP_FLAG)) { if (BASIC_OP_UNREDEFINED_P(BOP_CALL, PROC_REDEFINED_OP_FLAG)) {
return vm_invoke_block_opt_call(ec, reg_cfp, calling, ci, block_handler); return vm_invoke_block_opt_call(ec, reg_cfp, calling, ci, block_handler);