[ruby-dev:12703] rb_include_module

バグと呼ぶほどのものでもありませんが、
モジュールのインクルードに対して、
クラスのfreezeチェックの漏れがあります。

module M1; end
module M2; end
class A
  include M2
  p included_modules  # => [M2, Kernel]
end

A::freeze

module M2
  include M1
end

class A
  include M2
  p included_modules  # => [M2, M1, Kernel]
end


--- class.c.orig	Wed Mar 28 17:43:24 2001
+++ class.c	Fri Mar 30 11:08:27 2001
@@ -215,9 +215,9 @@
     return (VALUE)klass;
 }
 
-void
-rb_include_module(klass, module)
-    VALUE klass, module;
+static void
+rb_include_module_0(klass, module, orig)
+    VALUE klass, module, orig;
 {
     VALUE p;
     int changed = 0;
@@ -240,13 +240,13 @@
 	    if (BUILTIN_TYPE(p) == T_ICLASS &&
 		RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
 		if (RCLASS(module)->super) {
-		    rb_include_module(p, RCLASS(module)->super);
+		    rb_include_module_0(p, RCLASS(module)->super, orig);
 		}
 		if (changed) rb_clear_cache();
 		return;
 	    }
 	}
-	rb_frozen_class_p(klass);
+	rb_frozen_class_p(orig);
 	RCLASS(klass)->super = include_class_new(module, RCLASS(klass)->super);
 	klass = RCLASS(klass)->super;
 	module = RCLASS(module)->super;
@@ -255,6 +255,13 @@
     if (changed) rb_clear_cache();
 }
 
+void
+rb_include_module(klass, module)
+    VALUE klass, module;
+{
+  rb_include_module_0(klass, module, klass);
+}
+
 VALUE
 rb_mod_included_modules(mod)
     VALUE mod;

----
小迫＠ソフネック   渋谷区恵比寿1-15-1