From 6a60393280046a4991da8a415a77c60c7be240b5 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 14 May 2004 16:39:15 +0000
Subject: * range.c (range_each_func): terminates loop if generating value   is
 same to @end.  [ruby-talk:100269]

* string.c (rb_str_new4): should not reuse frozen shared string if
  the original is not an instance of String. [ruby-talk:100193]

* time.c (time_mdump): preserve GMT bit in the marshal data.
  [ruby-talk:100213]

* eval.c (is_defined): do not protect exception during receiver
  evaluation.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 object.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'object.c')

diff --git a/object.c b/object.c
index 95d00a9732..2fb2bd0638 100644
--- a/object.c
+++ b/object.c
@@ -208,9 +208,7 @@ init_copy(dest, obj)
     }
     RBASIC(dest)->flags &= ~(T_MASK|FL_EXIVAR);
     RBASIC(dest)->flags |= RBASIC(obj)->flags & (T_MASK|FL_EXIVAR|FL_TAINT);
-    if (FL_TEST(obj, FL_EXIVAR)) {
-	rb_copy_generic_ivar(dest, obj);
-    }
+    rb_copy_generic_ivar(dest, obj);
     rb_gc_copy_finalizer(dest, obj);
     switch (TYPE(obj)) {
       case T_OBJECT:
-- 
cgit v1.2.3