From 2cb9f63bab44a99a8fe58c9005cd65af9c91ce1d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 21 Jan 2010 02:12:07 +0000 Subject: [PATCH] * array.c (rb_ary_reverse_m): copy directly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ array.c | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5aceb2275..13fa09497c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jan 21 11:12:06 2010 Nobuyoshi Nakada + + * array.c (rb_ary_reverse_m): copy directly. + Thu Jan 21 09:38:00 2010 Nobuyoshi Nakada * configure.in: use AS_CASE instead of when, to get rid of diff --git a/array.c b/array.c index c4cd30cd63..ab89f5f30f 100644 --- a/array.c +++ b/array.c @@ -1495,16 +1495,22 @@ rb_ary_empty_p(VALUE ary) return Qfalse; } -VALUE -rb_ary_dup(VALUE ary) +static VALUE +rb_ary_dup_setup(VALUE ary) { VALUE dup = rb_ary_new2(RARRAY_LEN(ary)); int is_embed = ARY_EMBED_P(dup); DUPSETUP(dup, ary); if (is_embed) FL_SET_EMBED(dup); - MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary)); ARY_SET_LEN(dup, RARRAY_LEN(ary)); + return dup; +} +VALUE +rb_ary_dup(VALUE ary) +{ + VALUE dup = rb_ary_dup_setup(ary); + MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary)); return dup; } @@ -1787,7 +1793,15 @@ rb_ary_reverse_bang(VALUE ary) static VALUE rb_ary_reverse_m(VALUE ary) { - return rb_ary_reverse(rb_ary_dup(ary)); + VALUE dup = rb_ary_dup_setup(ary); + long len = RARRAY_LEN(ary); + + if (len > 0) { + VALUE *p1 = RARRAY_PTR(ary); + VALUE *p2 = RARRAY_PTR(dup) + len - 1; + do *p2-- = *p1++; while (--len > 0); + } + return dup; } struct ary_sort_data {