summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--bootstraptest/test_class.rb7
-rw-r--r--class.c1
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dfb0703e5..85f7dd4f47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jun 28 03:12:03 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bootstraptest/test_class.rb: add a test for [ruby-core:30843].
+
+Mon Jun 28 02:43:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * class.c (rb_mod_init_copy): when class is dup'ed, a metaclass of the
+ class should be attached to the dup'ed class, not the original
+ class. [ruby-core:30843] [Bug #3461]
+
Sat Jun 26 07:59:18 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
diff --git a/bootstraptest/test_class.rb b/bootstraptest/test_class.rb
index a7f6d4df47..664dd2f166 100644
--- a/bootstraptest/test_class.rb
+++ b/bootstraptest/test_class.rb
@@ -150,3 +150,10 @@ assert_match /::C\z/, %q{
Module.new{|m| c = class m::C; name; end}
c
}, '[ruby-dev:38456]'
+
+assert_normal_exit %q{
+ s = Symbol.dup
+ class << s
+ end
+ s.allocate.to_s
+}, '[ruby-core:30843]'
diff --git a/class.c b/class.c
index ac51f8e02b..e6fb74816b 100644
--- a/class.c
+++ b/class.c
@@ -146,6 +146,7 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
rb_obj_init_copy(clone, orig);
if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
RBASIC(clone)->klass = rb_singleton_class_clone(orig);
+ rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
}
RCLASS_SUPER(clone) = RCLASS_SUPER(orig);
if (RCLASS_IV_TBL(orig)) {