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

vm_insnhelper.c: avoid intermediate array

Browse Source 
* vm_insnhelper.c (vm_expandarray): get rid of creating
  intermediate Array object when conversion failed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-27 05:35:47 +00:00
parent fe18a62347
commit 27db7101c6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vm_insnhelper.c
View File

@ -1237,16 +1237,20 @@ vm_expandarray(rb_control_frame_t *cfp, VALUE ary, rb_num_t num, int flag)
VALUE *base = cfp->sp; VALUE *base = cfp->sp;
const VALUE *ptr; const VALUE *ptr;
rb_num_t len; rb_num_t len;
const VALUE obj = ary;
if (!RB_TYPE_P(ary, T_ARRAY)) { if (!RB_TYPE_P(ary, T_ARRAY) && NIL_P(ary = rb_check_array_type(ary))) {
ary = rb_ary_to_ary(ary); ary = obj;
ptr = &ary;
len = 1;
}
else {
ptr = RARRAY_CONST_PTR(ary);
len = (rb_num_t)RARRAY_LEN(ary);
} }
cfp->sp += space_size; cfp->sp += space_size;
ptr = RARRAY_CONST_PTR(ary);
len = (rb_num_t)RARRAY_LEN(ary);
if (flag & 0x02) { if (flag & 0x02) {
/* post: ..., nil ,ary[-1], ..., ary[0..-num] # top */ /* post: ..., nil ,ary[-1], ..., ary[0..-num] # top */
rb_num_t i = 0, j; rb_num_t i = 0, j;