diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 12:13:56 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 12:13:56 +0000 |
commit | 2459af86034b59136670cbfa14f369638232d55a (patch) | |
tree | e5393f4e19665f8d338693214294509cacab4866 /proc.c | |
parent | 1b5f534487e25b7a34b69247261a69ed6dc6d413 (diff) |
merge revision(s) 59080,59082: [Backport #13656]
proc.c: skip prepended modules
* proc.c (method_super_method): skip prepended modules and
continue from the super class of the original class.
[ruby-core:81666] [Bug #13656]
test/ruby/test_method.rb: refined [ruby-core:81666] [Bug #13656]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2572,7 +2572,7 @@ method_super_method(VALUE method) const rb_method_entry_t *me; TypedData_Get_Struct(method, struct METHOD, &method_data_type, data); - super_class = RCLASS_SUPER(method_entry_defined_class(data->me)); + super_class = RCLASS_SUPER(RCLASS_ORIGIN(method_entry_defined_class(data->me))); if (!super_class) return Qnil; me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(super_class, data->me->called_id); if (!me) return Qnil; |