kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm_insnhelper.c: zsuper in refinements

Browse source 
* vm_insnhelper.c (vm_call_zsuper): prevent infinite recursion
  zsuper in refinements.  [ruby-core:77161] [Bug #12729]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-08 05:16:33 +00:00
parent 510f0ec869
commit 7bbab207cb
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/ruby/test_refinement.rb
View file

@ -1789,6 +1789,27 @@ class TestRefinement < Test::Unit::TestCase
end; end;
end end
def test_public_in_refine
assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}")
begin;
bug12729 = '[ruby-core:77161] [Bug #12729]'
class Cow
private
def moo() "Moo"; end
end
module PublicCows
refine(Cow) {
public :moo
}
end
using PublicCows
assert_equal("Moo", Cow.new.moo, bug12729)
end;
end
private private
def eval_using(mod, s) def eval_using(mod, s)

19
vm_insnhelper.c
View file

@ -2016,18 +2016,20 @@ vm_call_method_missing(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb_c
return vm_call_method(th, reg_cfp, calling, ci, cc); return vm_call_method(th, reg_cfp, calling, ci, cc);
} }
static const rb_callable_method_entry_t *refined_method_callable_without_refinement(const rb_callable_method_entry_t *me);
static VALUE static VALUE
vm_call_zsuper(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc, VALUE klass) vm_call_zsuper(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc, VALUE klass)
{ {
klass = RCLASS_SUPER(klass); klass = RCLASS_SUPER(klass);
cc->me = klass ? rb_callable_method_entry(klass, ci->mid) : NULL; cc->me = klass ? rb_callable_method_entry(klass, ci->mid) : NULL;
if (cc->me != NULL) { if (!cc->me) {
return vm_call_method_each_type(th, cfp, calling, ci, cc);
}
else {
return vm_call_method_nome(th, cfp, calling, ci, cc); return vm_call_method_nome(th, cfp, calling, ci, cc);
} }
if (cc->me->def->type == VM_METHOD_TYPE_REFINED) {
cc->me = refined_method_callable_without_refinement(cc->me);
}
return vm_call_method_each_type(th, cfp, calling, ci, cc);
} }
static inline VALUE static inline VALUE
@ -2121,6 +2123,11 @@ refined_method_callable_without_refinement(const rb_callable_method_entry_t *me)
} }
VM_ASSERT(callable_method_entry_p(cme)); VM_ASSERT(callable_method_entry_p(cme));
if (UNDEFINED_METHOD_ENTRY_P(cme)) {
cme = NULL;
}
return cme; return cme;
} }
@ -2218,10 +2225,6 @@ vm_call_method_each_type(rb_thread_t *th, rb_control_frame_t *cfp, struct rb_cal
no_refinement_dispatch: no_refinement_dispatch:
if (cc->me->def->body.refined.orig_me) { if (cc->me->def->body.refined.orig_me) {
cc->me = refined_method_callable_without_refinement(cc->me); cc->me = refined_method_callable_without_refinement(cc->me);
if (UNDEFINED_METHOD_ENTRY_P(cc->me)) {
cc->me = NULL;
}
return vm_call_method(th, cfp, calling, ci, cc); return vm_call_method(th, cfp, calling, ci, cc);
} }
else { else {