ruby-changes:65806
From: Peter <ko1@a...>
Date: Thu, 8 Apr 2021 04:17:18 +0900 (JST)
Subject: [ruby-changes:65806] d8a13e5049 (master): [Bug #17780] Fix Method#super_method for module alias
https://git.ruby-lang.org/ruby.git/commit/?id=d8a13e5049 From d8a13e504992a45d52063f7c925408d7aad3595a Mon Sep 17 00:00:00 2001 From: Peter Zhu <peter.zhu@s...> Date: Wed, 7 Apr 2021 18:25:16 +0000 Subject: [Bug #17780] Fix Method#super_method for module alias Method#super_method crashes for aliased module methods because they are not defined on a class. This bug was introduced in c60aaed1856b2b6f90de0992c34771830019e021 as part of bug #17130. --- proc.c | 2 +- test/ruby/test_method.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/proc.c b/proc.c index b266365..390c674 100644 --- a/proc.c +++ b/proc.c @@ -3227,7 +3227,7 @@ method_super_method(VALUE method) https://github.com/ruby/ruby/blob/trunk/proc.c#L3227 TypedData_Get_Struct(method, struct METHOD, &method_data_type, data); iclass = data->iclass; if (!iclass) return Qnil; - if (data->me->def->type == VM_METHOD_TYPE_ALIAS) { + if (data->me->def->type == VM_METHOD_TYPE_ALIAS && data->me->defined_class) { super_class = RCLASS_SUPER(rb_find_defined_class_by_owner(data->me->defined_class, data->me->def->body.alias.original_me->owner)); mid = data->me->def->body.alias.original_me->def->original_id; diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index cc7421b..240821c 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -1168,6 +1168,19 @@ class TestMethod < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_method.rb#L1168 assert_nil(m.super_method) end + # Bug 17780 + def test_super_method_module_alias + m = Module.new do + def foo + end + alias :f :foo + end + + method = m.instance_method(:f) + super_method = method.super_method + assert_nil(super_method) + end + def rest_parameter(*rest) rest end -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/