* 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: http://svn.ruby-lang.org/repos/ruby/trunk@2784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 9 deletions

diff --git a/time.c b/time.c
index 223f5de8a..0d7216aca 100644
--- a/time.c
+++ b/time.c
@@ -793,12 +793,23 @@ time_hash(time)
     return LONG2FIX(hash);
 }
 
+static void
+time_modify(time)
+    VALUE time;
+{
+    rb_check_frozen(time);
+    if (!OBJ_TAINTED(time) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify Time");
+}
+
 static VALUE
 time_become(copy, time)
     VALUE copy, time;
 {
     struct time_object *tobj, *tcopy;
 
+    if (copy == time) return copy;
+    time_modify(copy);
     if (TYPE(time) != T_DATA || RDATA(time)->dfree != time_free) {
 	rb_raise(rb_eTypeError, "wrong argument type");
     }
@@ -818,15 +829,6 @@ time_dup(time)
     return dup;
 }
 
-static void
-time_modify(time)
-    VALUE time;
-{
-    if (OBJ_FROZEN(time)) rb_error_frozen("Time");
-    if (!OBJ_TAINTED(time) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: can't modify Time");
-}
-
 static VALUE
 time_localtime(time)
     VALUE time;