diff options
| -rw-r--r-- | spec/ruby/core/module/private_spec.rb | 39 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 19 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vm_method.c | 5 |
4 files changed, 62 insertions, 3 deletions
diff --git a/spec/ruby/core/module/private_spec.rb b/spec/ruby/core/module/private_spec.rb index bfdb5016c2..07b8f4c781 100644 --- a/spec/ruby/core/module/private_spec.rb +++ b/spec/ruby/core/module/private_spec.rb @@ -51,4 +51,43 @@ describe "Module#private" do Module.new.send(:private, :undefined) end.should raise_error(NameError) end + + it "only makes the method private in the class it is called on" do + base = Class.new do + def wrapped + 1 + end + end + + klass = Class.new(base) do + def wrapped + super + 1 + end + private :wrapped + end + + base.new.wrapped.should == 1 + lambda do + klass.new.wrapped + end.should raise_error(NameError) + end + + it "continues to allow a prepended module method to call super" do + wrapper = Module.new do + def wrapped + super + 1 + end + end + + klass = Class.new do + prepend wrapper + + def wrapped + 1 + end + private :wrapped + end + + klass.new.wrapped.should == 2 + end end diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 9980844eb4..94a2b5d4e6 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -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) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.0" #define RUBY_RELEASE_DATE "2018-03-20" -#define RUBY_PATCHLEVEL 46 +#define RUBY_PATCHLEVEL 47 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 diff --git a/vm_method.c b/vm_method.c index 8e7fd647d4..30561d3d4b 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1051,8 +1051,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); } @@ -1065,7 +1066,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) { |