From a9a7bbaf50253c2d060dd50e20a345efae7b9cf4 Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 24 Sep 2006 23:17:42 +0000 Subject: * array.c (rb_ary_shift): should clear shifting top element. [ruby-talk:216055] * array.c (rb_ary_shift): avoid creating shared object if array size is small. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index d154bf35e..87044a856 100644 --- a/array.c +++ b/array.c @@ -578,11 +578,14 @@ rb_ary_shift(VALUE ary) rb_ary_modify_check(ary); if (RARRAY_LEN(ary) == 0) return Qnil; top = RARRAY_PTR(ary)[0]; - if (ARY_EMBED_P(ary)) { + if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) { MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)); - ARY_SET_EMBED_LEN(ary, RARRAY_LEN(ary)-1); + ARY_SET_LEN(ary, RARRAY_LEN(ary)-1); } else { + if (!FL_TEST(ary, ELTS_SHARED)) { + RARRAY(ary)->ptr[0] = Qnil; + } ary_make_shared(ary); RARRAY(ary)->as.heap.ptr++; /* shift ptr */ RARRAY(ary)->as.heap.len--; -- cgit