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

ary_ensure_room_for_unshift: do not goto into a branch

Browse Source 
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
This commit is contained in:
卜部昌平 2020-06-11 10:28:34 +09:00
parent 2e8d8d10f2
commit 86c869fb59
Notes: git 2020-06-29 11:07:19 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
array.c
View File

@ -1569,28 +1569,27 @@ rb_ary_behead(VALUE ary, long n)
} }
static VALUE static VALUE
ary_ensure_room_for_unshift(VALUE ary, int argc) make_room_for_unshift(VALUE ary, const VALUE *head, VALUE *sharedp, int argc, long capa, long len)
{
if (head - sharedp < argc) {
long room = capa - len - argc;
room -= room >> 4;
MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len);
head = sharedp + argc + room;
}
ARY_SET_PTR(ary, head - argc);
assert(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary)));
ary_verify(ary);
return ARY_SHARED_ROOT(ary);
}
static VALUE
ary_modify_for_unshift(VALUE ary, int argc)
{ {
long len = RARRAY_LEN(ary); long len = RARRAY_LEN(ary);
long new_len = len + argc; long new_len = len + argc;
long capa; long capa;
const VALUE *head, *sharedp; const VALUE *head, *sharedp;
if (len > ARY_MAX_SIZE - argc) {
rb_raise(rb_eIndexError, "index %ld too big", new_len);
}
if (ARY_SHARED_P(ary)) {
VALUE shared_root = ARY_SHARED_ROOT(ary);
capa = RARRAY_LEN(shared_root);
if (ARY_SHARED_ROOT_OCCUPIED(shared_root) && capa > new_len) {
rb_ary_modify_check(ary);
head = RARRAY_CONST_PTR_TRANSIENT(ary);
sharedp = RARRAY_CONST_PTR_TRANSIENT(shared_root);
goto makeroom_if_need;
}
}
rb_ary_modify(ary); rb_ary_modify(ary);
capa = ARY_CAPA(ary); capa = ARY_CAPA(ary);
if (capa - (capa >> 6) <= new_len) { if (capa - (capa >> 6) <= new_len) {
@ -1606,21 +1605,7 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
ary_make_shared(ary); ary_make_shared(ary);
head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary); head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary);
goto makeroom; return make_room_for_unshift(ary, head, (void *)sharedp, argc, capa, len);
makeroom_if_need:
if (head - sharedp < argc) {
long room;
makeroom:
room = capa - new_len;
room -= room >> 4;
MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len);
head = sharedp + argc + room;
}
ARY_SET_PTR(ary, head - argc);
assert(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary)));
ary_verify(ary);
return ARY_SHARED_ROOT(ary);
} }
else { else {
/* sliding items */ /* sliding items */
@ -1632,6 +1617,34 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
return ary; return ary;
} }
} }
static VALUE
ary_ensure_room_for_unshift(VALUE ary, int argc)
{
long len = RARRAY_LEN(ary);
long new_len = len + argc;
if (len > ARY_MAX_SIZE - argc) {
rb_raise(rb_eIndexError, "index %ld too big", new_len);
}
else if (! ARY_SHARED_P(ary)) {
return ary_modify_for_unshift(ary, argc);
}
else {
VALUE shared_root = ARY_SHARED_ROOT(ary);
long capa = RARRAY_LEN(shared_root);
if (! ARY_SHARED_ROOT_OCCUPIED(shared_root)) {
return ary_modify_for_unshift(ary, argc);
}
else if (new_len > capa) {
return ary_modify_for_unshift(ary, argc);
}
else {
rb_ary_modify_check(ary);
const VALUE * head = RARRAY_CONST_PTR_TRANSIENT(ary);
void *sharedp = (void *)RARRAY_CONST_PTR_TRANSIENT(shared_root);
return make_room_for_unshift(ary, head, sharedp, argc, capa, len);
}
}
}
/* /*
* call-seq: * call-seq: