From 10a90fbce86c20f98dc4499eb0a34d9f347fdd29 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 18 Jul 2010 12:20:14 +0000 Subject: * array.c (rb_ary_clear): no need to duplicate buffer just before clearing. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ array.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24c134a9bc..516718c5f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 18 21:20:11 2010 Nobuyoshi Nakada + + * array.c (rb_ary_clear): no need to duplicate buffer just before + clearing. + Sun Jul 18 16:31:50 2010 Nobuyoshi Nakada * include/ruby/ruby.h (rb_data_type_t): restructured. [ruby-dev:41862] diff --git a/array.c b/array.c index 04c244a385..4cb0cb7731 100644 --- a/array.c +++ b/array.c @@ -2772,9 +2772,12 @@ rb_ary_replace(VALUE copy, VALUE orig) VALUE rb_ary_clear(VALUE ary) { - rb_ary_modify(ary); + rb_ary_modify_check(ary); ARY_SET_LEN(ary, 0); - if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { + if (ARY_SHARED_P(ary)) { + rb_ary_unshare(ary); + } + else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2); } return ary; -- cgit v1.2.3