1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

array.c add back shared array optimization to ary_ensure_room_for_unshift

Browse Source 
Bug fix in commit ec8e5f5aa64e2a [Bug #15952] disabled an
optimization in this function.

Closes: https://github.com/ruby/ruby/pull/2252
This commit is contained in:
Luke Gruber 2019-06-22 22:22:23 -04:00 committed by Nobuyoshi Nakada
parent ec8e5f5aa6
commit 5a187e26ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
array.c
View File

@ -1373,18 +1373,18 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
rb_raise(rb_eIndexError, "index %ld too big", new_len); rb_raise(rb_eIndexError, "index %ld too big", new_len);
} }
rb_ary_modify(ary);
if (ARY_SHARED_P(ary)) { if (ARY_SHARED_P(ary)) {
VALUE shared = ARY_SHARED(ary); VALUE shared = ARY_SHARED(ary);
capa = RARRAY_LEN(shared); capa = RARRAY_LEN(shared);
if (ARY_SHARED_OCCUPIED(shared) && capa > new_len) { if (ARY_SHARED_OCCUPIED(shared) && capa > new_len) {
rb_ary_modify_check(ary);
head = RARRAY_CONST_PTR_TRANSIENT(ary); head = RARRAY_CONST_PTR_TRANSIENT(ary);
sharedp = RARRAY_CONST_PTR_TRANSIENT(shared); sharedp = RARRAY_CONST_PTR_TRANSIENT(shared);
goto makeroom_if_need; goto makeroom_if_need;
} }
} }
rb_ary_modify(ary);
capa = ARY_CAPA(ary); capa = ARY_CAPA(ary);
if (capa - (capa >> 6) <= new_len) { if (capa - (capa >> 6) <= new_len) {
ary_double_capa(ary, new_len); ary_double_capa(ary, new_len);