From b295753888d25365090c4e8e0385c84103e67e85 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 21 May 2008 07:50:27 +0000 Subject: * array.c (rb_ary_compact_bang): avoid forceful realloc. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index 6fd7a75e0..f42eb9f82 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; -- cgit