archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 58660e9434: [Backport #17519]

Browse source 
Skip refined method when exporting methods with changed visibility

	Previously, attempting to change the visibility of a method in a
	singleton class for a class/module that is prepended to and refined
	would raise a NoMethodError.

	Fixes [Bug #17519]
	---
	 test/ruby/test_module.rb | 23 +++++++++++++++++++++++
	 vm_method.c              | 14 +++++++++++---
	 2 files changed, 34 insertions(+), 3 deletions(-)
This commit is contained in:
NARUSE, Yui 2021-04-02 12:26:56 +09:00
parent d3779ab3b8
commit d1cec0bca5
3 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
test/ruby/test_module.rb
View file

@ -2237,6 +2237,29 @@ class TestModule < Test::Unit::TestCase
assert_equal(0, 1 / 2)
end
def test_visibility_after_refine_and_visibility_change
m = Module.new
c = Class.new do
def x; :x end
end
c.prepend(m)
Module.new do
refine c do
def x; :y end
end
end
o1 = c.new
o2 = c.new
assert_equal(:x, o1.public_send(:x))
assert_equal(:x, o2.public_send(:x))
o1.singleton_class.send(:private, :x)
o2.singleton_class.send(:public, :x)
assert_raise(NoMethodError) { o1.public_send(:x) }
assert_equal(:x, o2.public_send(:x))
end
def test_prepend_visibility
bug8005 = '[ruby-core:53106] [Bug #8005]'
c = Class.new do

6
version.h
View file

@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 57
#define RUBY_PATCHLEVEL 58
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 24
#define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 2
#include "ruby/version.h"

14
vm_method.c
View file

@ -960,7 +960,7 @@ rb_method_entry_at(VALUE klass, ID id)
}
static inline rb_method_entry_t*
search_method(VALUE klass, ID id, VALUE *defined_class_ptr)
search_method0(VALUE klass, ID id, VALUE *defined_class_ptr, bool skip_refined)
{
rb_method_entry_t *me = NULL;
@ -969,7 +969,9 @@ search_method(VALUE klass, ID id, VALUE *defined_class_ptr)
for (; klass; klass = RCLASS_SUPER(klass)) {
RB_DEBUG_COUNTER_INC(mc_search_super);
if ((me = lookup_method_table(klass, id)) != 0) {
break;
if (!skip_refined || me->def->type != VM_METHOD_TYPE_REFINED) {
break;
}
}
}
@ -981,6 +983,12 @@ search_method(VALUE klass, ID id, VALUE *defined_class_ptr)
return me;
}
static inline rb_method_entry_t*
search_method(VALUE klass, ID id, VALUE *defined_class_ptr)
{
return search_method0(klass, id, defined_class_ptr, false);
}
static rb_method_entry_t *
search_method_protect(VALUE klass, ID id, VALUE *defined_class_ptr)
{
@ -1368,7 +1376,7 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi)
VALUE defined_class;
VALUE origin_class = RCLASS_ORIGIN(klass);
me = search_method(origin_class, name, &defined_class);
me = search_method0(origin_class, name, &defined_class, true);
if (!me && RB_TYPE_P(klass, T_MODULE)) {
me = search_method(rb_cObject, name, &defined_class);