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

merge revision(s) d8a13e5049: [Backport #17780]

Browse source 
[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
	c60aaed185 as part of bug #17130.
	---
	 proc.c                   |  2 +-
	 test/ruby/test_method.rb | 13 +++++++++++++
	 2 files changed, 14 insertions(+), 1 deletion(-)
This commit is contained in:
nagachika 2021-05-23 14:59:26 +09:00
parent fc73fc79cb
commit 410216c9db
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
proc.c
View file

@ -3199,7 +3199,7 @@ method_super_method(VALUE method)
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;

13
test/ruby/test_method.rb
View file

@ -1168,6 +1168,19 @@ class TestMethod < Test::Unit::TestCase
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

2
version.h
View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 84
#define RUBY_PATCHLEVEL 85
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 5