* variable.c (rb_copy_generic_ivar): remove old generic instance

	  variable table if it existes.

	* class.c (rb_make_metaclass): metaclass of a metaclass is a
	  metaclass itself.


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

1 files changed, 9 insertions, 1 deletions

diff --git a/variable.c b/variable.c
index 0b2c8ebe07..c37548fb91 100644
--- a/variable.c
+++ b/variable.c
@@ -924,7 +924,15 @@ rb_copy_generic_ivar(clone, obj)
 
     if (!generic_iv_tbl) return;
     if (st_lookup(generic_iv_tbl, obj, &tbl)) {
-	st_add_direct(generic_iv_tbl, clone, st_copy(tbl));
+	st_table *old;
+
+	if (st_lookup(generic_iv_tbl, clone, &old)) {
+	    st_free_table(old);
+	    st_insert(generic_iv_tbl, clone, st_copy(tbl));
+	}
+	else {
+	    st_add_direct(generic_iv_tbl, clone, st_copy(tbl));
+	}
     }
 }