diff options
| author | NARUSE, Yui <naruse@airemix.jp> | 2022-02-03 08:04:57 +0900 |
|---|---|---|
| committer | NARUSE, Yui <naruse@airemix.jp> | 2022-02-03 08:04:57 +0900 |
| commit | 42c9ef769f210d88241a114395dd5ffc27b2fb87 (patch) | |
| tree | f264115c882c59b101cb8740358b5870f5ca1744 /vm_method.c | |
| parent | 7bef8ed183a336b040f051d7c2133b93364920c6 (diff) | |
merge revision(s) 7ff1bf317887c0d7b21e91ad548d07b9f05c540c,e89d80702bd98a8276243a7fcaa2a158b3bfb659: [Backport #18516]
An alias can suppress method redefinition warning
---
test/ruby/test_alias.rb | 11 +++++++++++
1 file changed, 11 insertions(+)
Fix memory leak at the same named alias [Bug #18516]
When aliasing a method to the same name method, set a separate bit
flag on that method definition, instead of the reference count
increment. Although this kind of alias has no actual effect at
runtime, is used as the hack to suppress the method re-definition
warning.
---
method.h | 1 +
test/ruby/test_alias.rb | 18 ++++++++++++++++++
vm_method.c | 9 ++++++++-
3 files changed, 27 insertions(+), 1 deletion(-)
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vm_method.c b/vm_method.c index 38d03fbe2b..d1cfd232e5 100644 --- a/vm_method.c +++ b/vm_method.c @@ -856,6 +856,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil if (RTEST(ruby_verbose) && type != VM_METHOD_TYPE_UNDEF && (old_def->alias_count == 0) && + (!old_def->no_redef_warning) && !make_refined && old_def->type != VM_METHOD_TYPE_UNDEF && old_def->type != VM_METHOD_TYPE_ZSUPER && @@ -1086,7 +1087,13 @@ method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *me, rb_method_visibility_t visi, VALUE defined_class) { rb_method_entry_t *newme = rb_method_entry_make(klass, mid, defined_class, visi, - me->def->type, method_definition_addref(me->def), 0, NULL); + me->def->type, me->def, 0, NULL); + if (newme == me) { + me->def->no_redef_warning = TRUE; + } + else { + method_definition_addref(me->def); + } method_added(klass, mid); return newme; } |