ko1	2015-06-01 19:26:05 +0900 (Mon, 01 Jun 2015)

  New Revision: 50715

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50715

  Log:
    * vm_method.c (rb_method_entry_make): do not show warning message
      when method_entry is an alias.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
    trunk/vm_method.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50714)
+++ ChangeLog	(revision 50715)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Jun  1 19:24:42 2015  Koichi Sasada  <ko1@a...>
+
+	* 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@a...>
 
 	* internal.h: move class related definitions.
Index: vm_method.c
===================================================================
--- vm_method.c	(revision 50714)
+++ vm_method.c	(revision 50715)
@@ -324,7 +324,8 @@ rb_method_entry_make(VALUE klass, ID mid https://github.com/ruby/ruby/blob/trunk/vm_method.c#L324
 	    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));
Index: gc.c
===================================================================
--- gc.c	(revision 50714)
+++ gc.c	(revision 50715)
@@ -4315,7 +4315,7 @@ gc_mark_children(rb_objspace_t *objspace https://github.com/ruby/ruby/blob/trunk/gc.c#L4315
 	    rb_bug("T_IMEMO: unreachable");
 	}
     }
-
+a
     gc_mark(objspace, any->as.basic.klass);
 
     switch (BUILTIN_TYPE(obj)) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/