* vm_method.c (rb_class_clear_method_cache): should clear all

  RCLASS_CALLABLE_M_TBLs of all sub-classes (T_ICLASS).

  RCLASS_CALLABLE_M_TBL() caches complemented method entries.
  It should be cleared when the modules are cleared.
  On previous version clears only for direct children.
  It is enough for normal modules because corresponding T_ICLASSes
  are direct children.

  However, refinements create complex data structure. So that
  we need to clear all children (and descendants).
  [ruby-core:71423] [Bug #11672]

* vm_method.c (rb_clear_method_cache_by_class): rb_mKernel
  doesn't call rb_class_clear_method_cache, so that
  clear child T_ICLASSes.

* test/ruby/test_refinement.rb: enable disabled test.




git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 6 deletions

diff --git a/vm_method.c b/vm_method.c
index 5089c31ee4..eff6b944c2 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -62,6 +62,20 @@ static void
 rb_class_clear_method_cache(VALUE klass, VALUE arg)
 {
     RCLASS_SERIAL(klass) = rb_next_class_serial();
+
+    if (RB_TYPE_P(klass, T_ICLASS)) {
+	struct rb_id_table *table = RCLASS_CALLABLE_M_TBL(klass);
+	if (table) {
+	    rb_id_table_clear(table);
+	}
+    }
+    else {
+	if (RCLASS_CALLABLE_M_TBL(klass) != 0) {
+	    rb_obj_info_dump(klass);
+	    rb_bug("RCLASS_CALLABLE_M_TBL(klass) != 0");
+	}
+    }
+
     rb_class_foreach_subclass(klass, rb_class_clear_method_cache, arg);
 }
 
@@ -93,14 +107,14 @@ rb_clear_method_cache_by_class(VALUE klass)
 	else {
 	    rb_class_clear_method_cache(klass, Qnil);
 	}
+    }
 
-	if (RB_TYPE_P(klass, T_MODULE)) {
-	    rb_subclass_entry_t *entry = RCLASS_EXT(klass)->subclasses;
+    if (klass == rb_mKernel) {
+	rb_subclass_entry_t *entry = RCLASS_EXT(klass)->subclasses;
 
-	    for (; entry != NULL; entry = entry->next) {
-		struct rb_id_table *table = RCLASS_CALLABLE_M_TBL(entry->klass);
-		if (table)rb_id_table_clear(table);
-	    }
+	for (; entry != NULL; entry = entry->next) {
+	    struct rb_id_table *table = RCLASS_CALLABLE_M_TBL(entry->klass);
+	    if (table)rb_id_table_clear(table);
 	}
     }
 }