diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-24 23:17:42 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-24 23:17:42 +0000 |
| commit | a9a7bbaf50253c2d060dd50e20a345efae7b9cf4 (patch) | |
| tree | f998c63db0ed7ac12558b10ade0d42085280a0b6 /array.c | |
| parent | 90a109933ef54e80aab1c2ed37e89dbb7e24e7eb (diff) | |
| download | ruby-a9a7bbaf50253c2d060dd50e20a345efae7b9cf4.tar.gz ruby-a9a7bbaf50253c2d060dd50e20a345efae7b9cf4.tar.xz ruby-a9a7bbaf50253c2d060dd50e20a345efae7b9cf4.zip | |
* 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
Diffstat (limited to 'array.c')
| -rw-r--r-- | array.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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--; |