diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-25 06:11:14 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-25 06:11:14 +0000 |
| commit | 31d6b6f7d6ed97423b15bd21ae98cc21c9a78fc5 (patch) | |
| tree | 6c09f8be36c80652678842803c5ff07a624bdda4 | |
| parent | e59be153682d6240b2dd571c2272fb31f905d84c (diff) | |
merge revision(s) 62725: [Backport #14604]
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
| -rw-r--r-- | test/ruby/test_module.rb | 19 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vm_method.c | 5 |
3 files changed, 23 insertions, 3 deletions
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index d1c5d53822..d749be4361 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.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 diff --git a/vm_method.c b/vm_method.c index a5c83ab0f6..7980688c44 100644 --- a/vm_method.c +++ b/vm_method.c @@ -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) { |