diff options
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | method.h | 5 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 14 | ||||
-rw-r--r-- | vm_method.c | 35 |
4 files changed, 58 insertions, 11 deletions
@@ -1,3 +1,18 @@ +Tue Nov 17 18:36:52 2015 Koichi Sasada <ko1@atdot.net> + + * method.h: introduce rb_method_definition_t::complemented_count. + + * vm_method.c (method_definition_addref_complement): introduced. + + def->alias_count is used to decide warn or do not warn at method + redefinition. Complented methods should not prevent redefiniton + warnings. + + * vm_method.c (rb_method_definition_release): release def iff + alias_count == 0 && complemented_count == 0. + + * test/ruby/test_module.rb: add a test. + Tue Nov 17 15:34:34 2015 Martin Duerst <duerst@it.aoyama.ac.jp> * NEWS: Added update from Unicode 7.0.0 to 8.0.0 [ci skip] @@ -143,8 +143,9 @@ typedef struct rb_method_refined_struct { } rb_method_refined_t; typedef struct rb_method_definition_struct { - rb_method_type_t type; /* method type */ - int alias_count; + rb_method_type_t type : 8; /* method type */ + int alias_count : 28; + int complemented_count: 28; union { rb_method_iseq_t iseq; diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index dbbeca850d..b86efd7005 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1280,6 +1280,20 @@ class TestModule < Test::Unit::TestCase undef foo end end + + stderr = EnvUtil.verbose_warning do + Module.new do + def foo; end + mod = self + c = Class.new do + include mod + end + c.new.foo + def foo; end + end + end + assert_match(/: warning: method redefined; discarding old foo/, stderr) + assert_match(/: warning: previous definition of foo/, stderr) end def test_protected_singleton_method diff --git a/vm_method.c b/vm_method.c index c88167434b..657fbbd70d 100644 --- a/vm_method.c +++ b/vm_method.c @@ -135,19 +135,24 @@ rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_me } static void -rb_method_definition_release(rb_method_definition_t *def) +rb_method_definition_release(rb_method_definition_t *def, int complemented) { if (def != NULL) { - const int count = def->alias_count; - VM_ASSERT(count >= 0); + const int alias_count = def->alias_count; + const int complemented_count = def->complemented_count; + VM_ASSERT(alias_count >= 0); + VM_ASSERT(complemented_count >= 0); - if (count == 0) { - if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d\n", def, rb_id2name(def->original_id), count); + if (alias_count + complemented_count == 0) { + if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d,%d (remove)\n", def, rb_id2name(def->original_id), alias_count, complemented_count); xfree(def); } else { - if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d->%d\n", def, rb_id2name(def->original_id), count, count-1); - def->alias_count--; + if (complemented) def->complemented_count--; + else if (def->alias_count > 0) def->alias_count--; + + if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d->%d,%d->%d (dec)\n", def, rb_id2name(def->original_id), + alias_count, def->alias_count, complemented_count, def->complemented_count); } } } @@ -155,7 +160,7 @@ rb_method_definition_release(rb_method_definition_t *def) void rb_free_method_entry(const rb_method_entry_t *me) { - rb_method_definition_release(me->def); + rb_method_definition_release(me->def, RB_TYPE_P(me->owner, T_MODULE) && RB_TYPE_P(me->defined_class, T_ICLASS)); } static inline rb_method_entry_t *search_method(VALUE klass, ID id, VALUE *defined_class_ptr); @@ -342,6 +347,14 @@ method_definition_addref(rb_method_definition_t *def) return def; } +static rb_method_definition_t * +method_definition_addref_complement(rb_method_definition_t *def) +{ + def->complemented_count++; + if (METHOD_DEBUG) fprintf(stderr, "+%p-%s:%d\n", def, rb_id2name(def->original_id), def->alias_count); + return def; +} + static rb_method_entry_t * rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, const rb_method_definition_t *def) { @@ -385,8 +398,12 @@ const rb_callable_method_entry_t * rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, VALUE defined_class) { rb_method_entry_t *me = rb_method_entry_alloc(src_me->called_id, src_me->owner, defined_class, - method_definition_addref(src_me->def)); + method_definition_addref_complement(src_me->def)); METHOD_ENTRY_FLAGS_COPY(me, src_me); + + VM_ASSERT(RB_TYPE_P(me->owner, T_MODULE)); + VM_ASSERT(RB_TYPE_P(me->defined_class, T_ICLASS)); + return (rb_callable_method_entry_t *)me; } |