diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-08-05 14:05:59 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-08-05 14:05:59 +0000 |
| commit | 6bb473ea3778908aaa8da51bc8be63b86652e69a (patch) | |
| tree | 207b72d12064d558304fcd3aaa16743f6eb7c6b0 /vm_insnhelper.c | |
| parent | 52eb4e661ea396382e73cd6a6c1dcf4c4b3ec824 (diff) | |
merge revision(s) 5e018214e7435030727a97ac49db038d96438e74: [Backport #15720]
Fix SystemStackError when calling a method in an unused refinement
Fixes [Bug #15720]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 4f39a0f5a3..4a47a8ee5c 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2315,7 +2315,10 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st goto no_refinement_dispatch; } } - cc->me = ref_me; + if (cc->me->def->type != VM_METHOD_TYPE_REFINED || + cc->me->def != ref_me->def) { + cc->me = ref_me; + } if (ref_me->def->type != VM_METHOD_TYPE_REFINED) { return vm_call_method(ec, cfp, calling, ci, cc); } |