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) 62725: [Backport #14604]

Browse source 
Fix setting method visibility on method wrapped with prepend

	Ignore prepended modules when looking for already defined methods on a
	class to set the visibility on.
	[Fix GH-1834]

	From: Dylan Thacker-Smith <Dylan.Smith@shopify.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-25 06:11:14 +00:00
parent e59be15368
commit 31d6b6f7d6
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/ruby/test_module.rb
View file

@ -1876,6 +1876,25 @@ class TestModule < Test::Unit::TestCase
assert_raise(ArgumentError) { Module.new { prepend } }
end
def test_prepend_private_super
wrapper = Module.new do
def wrapped
super + 1
end
end
klass = Class.new do
prepend wrapper
def wrapped
1
end
private :wrapped
end
assert_equal(2, klass.new.wrapped)
end
def test_class_variables
m = Module.new
m.class_variable_set(:@@foo, 1)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-25"
#define RUBY_PATCHLEVEL 287
#define RUBY_PATCHLEVEL 288
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3

5
vm_method.c
View file

@ -1057,8 +1057,9 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi)
{
rb_method_entry_t *me;
VALUE defined_class;
VALUE origin_class = RCLASS_ORIGIN(klass);
me = search_method(klass, name, &defined_class);
me = search_method(origin_class, name, &defined_class);
if (!me && RB_TYPE_P(klass, T_MODULE)) {
me = search_method(rb_cObject, name, &defined_class);
}
@ -1071,7 +1072,7 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi)
if (METHOD_ENTRY_VISI(me) != visi) {
rb_vm_check_redefinition_opt_method(me, klass);
if (klass == defined_class || RCLASS_ORIGIN(klass) == defined_class) {
if (klass == defined_class || origin_class == defined_class) {
METHOD_ENTRY_VISI_SET(me, visi);
if (me->def->type == VM_METHOD_TYPE_REFINED && me->def->body.refined.orig_me) {