From 8c48bbe191b824ff6368b2d87028d9b1aa20ba8f Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 1 Jun 2015 10:26:05 +0000 Subject: * 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 --- ChangeLog | 5 +++++ gc.c | 2 +- vm_method.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2472ca5460..9adaf44592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 1 19:24:42 2015 Koichi Sasada + + * 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 * internal.h: move class related definitions. diff --git a/gc.c b/gc.c index eb0a0736b2..c92fecaff9 100644 --- a/gc.c +++ b/gc.c @@ -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)); -- cgit v1.2.3