зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
d9d0594a1a
Коммит
7221252ab1
|
@ -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>
|
Mon Jun 1 15:47:16 2015 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
* internal.h: move class related definitions.
|
* internal.h: move class related definitions.
|
||||||
|
|
2
gc.c
2
gc.c
|
@ -4315,7 +4315,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
|
||||||
rb_bug("T_IMEMO: unreachable");
|
rb_bug("T_IMEMO: unreachable");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
a
|
||||||
gc_mark(objspace, any->as.basic.klass);
|
gc_mark(objspace, any->as.basic.klass);
|
||||||
|
|
||||||
switch (BUILTIN_TYPE(obj)) {
|
switch (BUILTIN_TYPE(obj)) {
|
||||||
|
|
|
@ -324,7 +324,8 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type,
|
||||||
type != VM_METHOD_TYPE_UNDEF &&
|
type != VM_METHOD_TYPE_UNDEF &&
|
||||||
old_def->alias_count == 0 &&
|
old_def->alias_count == 0 &&
|
||||||
old_def->type != VM_METHOD_TYPE_UNDEF &&
|
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;
|
const rb_iseq_t *iseq = 0;
|
||||||
|
|
||||||
rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid));
|
rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid));
|
||||||
|
|
Загрузка…
Ссылка в новой задаче