summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-12 13:46:55 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-12 13:46:55 +0000
commit35c827a6056c8762aff29d4303cbe6131f338e5a (patch)
tree3fe254bdbc2b9b98f723980b8f5c3bedb100c0ca /vm_insnhelper.c
parent91036252bb18b6773a8c8e4190623d659261e4a5 (diff)
merge revision(s) 57655: [Backport #13227]
vm_insnhelper.c: super to module in refinement * vm_insnhelper.c (vm_call_zsuper): method defined in module in refinement is not callable as-is. dispatch again. [ruby-core:79588] [Bug #13227] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 662a2d6456..a86861c7fc 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2026,7 +2026,8 @@ vm_call_zsuper(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_calling_info
if (!cc->me) {
return vm_call_method_nome(th, cfp, calling, ci, cc);
}
- if (cc->me->def->type == VM_METHOD_TYPE_REFINED) {
+ if (cc->me->def->type == VM_METHOD_TYPE_REFINED &&
+ cc->me->def->body.refined.orig_me) {
cc->me = refined_method_callable_without_refinement(cc->me);
}
return vm_call_method_each_type(th, cfp, calling, ci, cc);