diff options
| -rw-r--r-- | proc.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_method.rb | 21 |
2 files changed, 23 insertions, 2 deletions
@@ -1572,12 +1572,12 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass, VALUE iclass, } if (me->def->type == VM_METHOD_TYPE_ZSUPER) { if (me->defined_class) { - VALUE klass = RCLASS_SUPER(RCLASS_ORIGIN(me->defined_class)); + VALUE klass = RCLASS_SUPER(RCLASS_ORIGIN(me->defined_class)); id = me->def->original_id; me = (rb_method_entry_t *)rb_callable_method_entry_with_refinements(klass, id, &iclass); } else { - VALUE klass = RCLASS_SUPER(me->owner); + VALUE klass = RCLASS_SUPER(RCLASS_ORIGIN(me->owner)); id = me->def->original_id; me = rb_method_entry_without_refinements(klass, id, &iclass); } diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 12f6f9aa27..43c6c6d44b 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -1181,6 +1181,27 @@ class TestMethod < Test::Unit::TestCase assert_separately [], "RubyVM::InstructionSequence.compile_option = {trace_instruction: false}\n" + body end + def test_zsuper_private_override_instance_method + assert_separately(%w(--disable-gems), <<-'end;', timeout: 30) + # Bug #16942 [ruby-core:98691] + module M + def x + end + end + + module M2 + prepend Module.new + include M + private :x + end + + ::Object.prepend(M2) + + m = Object.instance_method(:x) + assert_equal M, m.owner + end; + end + def test_eqq assert_operator(0.method(:<), :===, 5) assert_not_operator(0.method(:<), :===, -5) |