From e23aa93e5b35da0e9eba75cae8482e8ea47c00d8 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Nov 2005 07:38:38 +0000
Subject: [PATCH] * array.c (rb_ary_fill): previous commit disabled this usage:

    a = [0,1,2,3,4,5,6,7,8,9]
    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]

  previous commit has advantange for early garbage collection, but
  potensially would break some script. so I reverted behavior.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 10 ++++++++++
 array.c   |  7 +------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc21d5d1fc..123aa7edad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c (rb_ary_fill): previous commit disabled this usage:
+
+	    a = [0,1,2,3,4,5,6,7,8,9]
+	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
+
+	  previous commit has advantange for early garbage collection, but
+	  potensially this would break some script. so I reverted behavior.
+
 Tue Nov 15 16:04:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c (rb_ary_fill): tail elements were vanished when the middle
diff --git a/array.c b/array.c
index b23c311f0f..b808c6449b 100644
--- a/array.c
+++ b/array.c
@@ -2261,13 +2261,8 @@ rb_ary_fill(argc, argv, ary)
 	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
 	    RARRAY(ary)->aux.capa = end;
 	}
-	RARRAY(ary)->len = end;
-    }
-    if (beg > RARRAY(ary)->len) {
 	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
-    }
-    else {
-	rb_mem_clear(RARRAY(ary)->ptr + beg, end - beg);
+	RARRAY(ary)->len = end;
     }
 
     if (block_p) {