diff options
| author | nagachika <nagachika@ruby-lang.org> | 2021-03-20 16:14:18 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-03-20 16:14:18 +0900 |
| commit | 6e962f02b266c3a6c47e50cf2e9ab7b1db25e515 (patch) | |
| tree | bb6fb8c315a77004ebef1e390f06b2cb82739ea3 /vm_method.c | |
| parent | ce02265d59af720e38cdade0c90f50b0408f27a8 (diff) | |
merge revision(s) 58660e943488778563b9e41005a601e9660ce21f: [Backport #17519]
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(-)
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/vm_method.c b/vm_method.c index efe71601d1..3c087841dc 100644 --- a/vm_method.c +++ b/vm_method.c @@ -738,13 +738,17 @@ rb_get_alloc_func(VALUE klass) } 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; for (; klass; klass = RCLASS_SUPER(klass)) { RB_DEBUG_COUNTER_INC(mc_search_super); - if ((me = lookup_method_table(klass, id)) != 0) break; + if ((me = lookup_method_table(klass, id)) != 0) { + if (!skip_refined || me->def->type != VM_METHOD_TYPE_REFINED) { + break; + } + } } if (defined_class_ptr) @@ -813,6 +817,12 @@ verify_method_cache(VALUE klass, ID id, VALUE defined_class, rb_method_entry_t * } } +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 * method_entry_get(VALUE klass, ID id, VALUE *defined_class_ptr) { @@ -1068,7 +1078,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); } |