kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
usa 2017-06-30 12:13:56 +00:00
parent 1b5f534487
commit 2459af8603
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jun 30 21:13:25 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (method_super_method): skip prepended modules and continue from
the super class of the original class. [Bug #13656]
Fri Jun 30 21:10:48 2017 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/smtp.rb (getok, get_response): raise an ArgumentError when

2
proc.c
View File

@ -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;

12
test/ruby/test_method.rb
View File

@ -905,6 +905,18 @@ class TestMethod < Test::Unit::TestCase
assert_nil(m)
end
def test_super_method_with_prepended_module
bug = '[ruby-core:81666] [Bug #13656] should be the method of the parent'
c1 = EnvUtil.labeled_class("C1") {def m; end}
c2 = EnvUtil.labeled_class("C2", c1) {def m; end}
c2.prepend(EnvUtil.labeled_module("M"))
m1 = c1.instance_method(:m)
m2 = c2.instance_method(:m).super_method
assert_equal(m1, m2, bug)
assert_equal(c1, m2.owner, bug)
assert_equal(m1.source_location, m2.source_location, bug)
end
def rest_parameter(*rest)
rest
end

2
version.h
View File

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-06-30"
#define RUBY_PATCHLEVEL 327
#define RUBY_PATCHLEVEL 328
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 6