From aaa9cb1ab4dd225113f027d4b725b8bb417e2cb1 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 9 Nov 2012 07:08:45 +0000 Subject: array.c: use shared array in rb_ary_slice * array.c (rb_ary_splice): use shared array in rb_ary_slice. [Feature #6638] - use ary_ensure_room_for_push when rb_ary_slice used to add at the end of array, cause rb_ary_concat use rb_ary_slice. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index eb5d01217f..88691805ce 100644 --- a/array.c +++ b/array.c @@ -1388,15 +1388,12 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) rpl = rb_ary_to_ary(rpl); rlen = RARRAY_LEN(rpl); } - rb_ary_modify(ary); if (beg >= RARRAY_LEN(ary)) { if (beg > ARY_MAX_SIZE - rlen) { rb_raise(rb_eIndexError, "index %ld too big", beg); } + ary_ensure_room_for_push(ary, rlen); len = beg + rlen; - if (len >= ARY_CAPA(ary)) { - ary_double_capa(ary, len); - } rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary)); if (rlen > 0) { MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen); @@ -1406,6 +1403,7 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) else { long alen; + rb_ary_modify(ary); alen = RARRAY_LEN(ary) + rlen - len; if (alen >= ARY_CAPA(ary)) { ary_double_capa(ary, alen); -- cgit v1.2.3