From 87d8a3b9ce775529f8fee6d39061cd958092bf1e Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 19 Jul 2010 03:33:33 +0000 Subject: [PATCH] * array.c (rb_ary_clear): should not unshare embedded array, and should make unshared array embedded. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ array.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a4e7b7dc29..e8c0fc5fbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 19 12:33:29 2010 Nobuyoshi Nakada + + * array.c (rb_ary_clear): should not unshare embedded array, and + should make unshared array embedded. + Mon Jul 19 09:00:58 2010 Nobuyoshi Nakada * NEWS (Kernel#instance_eval): add an incompatible change since diff --git a/array.c b/array.c index 4cb0cb7731..c2a4e8563e 100644 --- a/array.c +++ b/array.c @@ -2775,7 +2775,10 @@ rb_ary_clear(VALUE ary) rb_ary_modify_check(ary); ARY_SET_LEN(ary, 0); if (ARY_SHARED_P(ary)) { - rb_ary_unshare(ary); + if (!ARY_EMBED_P(ary)) { + rb_ary_unshare(ary); + FL_SET_EMBED(ary); + } } else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);