From fd7ee4552cdd8c121f6bc6364fdd0e764ae35520 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 29 Jul 2017 12:42:42 +0000 Subject: visibility of inherited method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * vm_insnhelper.c (vm_call_method_each_type): honor the original visibility of inherited methods when a refinement is defined but not activated. [ruby-core:82209] [Bug #13776] Author: Mon_Ouie (Mon ouïe) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 856178d5d0..d835997f7c 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2283,11 +2283,12 @@ vm_call_method_each_type(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_cal no_refinement_dispatch: if (cc->me->def->body.refined.orig_me) { cc->me = refined_method_callable_without_refinement(cc->me); - return vm_call_method(th, cfp, calling, ci, cc); } else { - return vm_call_zsuper(th, cfp, calling, ci, cc, cc->me->owner); + VALUE klass = RCLASS_SUPER(cc->me->owner); + cc->me = klass ? rb_callable_method_entry(klass, ci->mid) : NULL; } + return vm_call_method(th, cfp, calling, ci, cc); } } -- cgit v1.2.3