From f827d9568507ed7b0f562be605a798a4ff0cf6f0 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 21 May 2008 07:50:27 +0000 Subject: [PATCH] * array.c (rb_ary_compact_bang): avoid forceful realloc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ array.c | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30cab8267c..c0905e83f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed May 21 16:48:22 2008 Yukihiro Matsumoto + + * array.c (rb_ary_compact_bang): avoid forceful realloc. + Wed May 21 07:42:28 2008 NARUSE, Yui * string.c (rb_usascii_str_new): use rb_str_new. diff --git a/array.c b/array.c index 6fd7a75e01..f42eb9f826 100644 --- a/array.c +++ b/array.c @@ -2710,11 +2710,13 @@ rb_ary_compact_bang(VALUE ary) if (NIL_P(*t)) t++; else *p++ = *t++; } - if (RARRAY_LEN(ary) == (p - RARRAY_PTR(ary))) { + n = p - RARRAY_PTR(ary); + if (RARRAY_LEN(ary) == n) { return Qnil; } - n = p - RARRAY_PTR(ary); - RESIZE_CAPA(ary, n); + if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { + RESIZE_CAPA(ary, ARY_DEFAULT_SIZE * 2); + } RARRAY(ary)->len = n; return ary;