diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-01 10:26:05 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-01 10:26:05 +0000 |
| commit | 7221252ab1ab473f82eb8c2def387a2719a7fa19 (patch) | |
| tree | dc51f7b9908ad461c94fdded4716be20685c33df | |
| parent | d9d0594a1a771de685cd4ebd4ec52ff7b39f246f (diff) | |
* vm_method.c (rb_method_entry_make): do not show warning message
when method_entry is an alias.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gc.c | 2 | ||||
| -rw-r--r-- | vm_method.c | 3 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Jun 1 19:24:42 2015 Koichi Sasada <ko1@atdot.net> + + * vm_method.c (rb_method_entry_make): do not show warning message + when method_entry is an alias. + Mon Jun 1 15:47:16 2015 Koichi Sasada <ko1@atdot.net> * internal.h: move class related definitions. @@ -4315,7 +4315,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj) rb_bug("T_IMEMO: unreachable"); } } - +a gc_mark(objspace, any->as.basic.klass); switch (BUILTIN_TYPE(obj)) { diff --git a/vm_method.c b/vm_method.c index 11131fc807..02e46f3b84 100644 --- a/vm_method.c +++ b/vm_method.c @@ -324,7 +324,8 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type, type != VM_METHOD_TYPE_UNDEF && old_def->alias_count == 0 && old_def->type != VM_METHOD_TYPE_UNDEF && - old_def->type != VM_METHOD_TYPE_ZSUPER) { + old_def->type != VM_METHOD_TYPE_ZSUPER && + old_def->type != VM_METHOD_TYPE_ALIAS) { const rb_iseq_t *iseq = 0; rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid)); |