kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

compile.c: iseq_pop_newarray

Browse source 
* compile.c (iseq_pop_newarray): optimize array literal in
  condition.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-14 08:04:30 +00:00
parent db9f36f3fa
commit ea49381e51
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
compile.c
View file

@ -2194,6 +2194,22 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
return 1;
}
static int
iseq_pop_newarray(rb_iseq_t *iseq, INSN *iobj)
{
switch (OPERAND_AT(iobj, 0)) {
case INT2FIX(0): /* empty array */
REMOVE_ELEM(&iobj->link);
return TRUE;
case INT2FIX(1): /* single element array */
REMOVE_ELEM(&iobj->link);
return FALSE;
default:
iobj->insn_id = BIN(adjuststack);
return TRUE;
}
}
static int
iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
{
@ -2418,14 +2434,22 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
OPERAND_AT(pobj, 0) == Qfalse :
FALSE);
}
else if (IS_INSN_ID(pobj, putstring) || IS_INSN_ID(pobj, duparray)) {
else if (IS_INSN_ID(pobj, putstring) ||
IS_INSN_ID(pobj, duparray) ||
IS_INSN_ID(pobj, newarray)) {
cond = IS_INSN_ID(iobj, branchif);
}
else if (IS_INSN_ID(pobj, putnil)) {
cond = !IS_INSN_ID(iobj, branchif);
}
else break;
REMOVE_ELEM(iobj->link.prev);
if (prev_dup || !IS_INSN_ID(pobj, newarray)) {
REMOVE_ELEM(iobj->link.prev);
}
else if (!iseq_pop_newarray(iseq, pobj)) {
pobj = new_insn_core(iseq, pobj->line_no, BIN(pop), 0, NULL);
INSERT_ELEM_NEXT(&iobj->link, &pobj->link);
}
if (cond) {
iobj->insn_id = BIN(jump);
goto again;
@ -2452,12 +2476,16 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
if (IS_INSN(prev)) {
enum ruby_vminsn_type previ = ((INSN *)prev)->insn_id;
if (previ == BIN(putobject) || previ == BIN(putnil) ||
previ == BIN(putself) || previ == BIN(putstring)) {
previ == BIN(putself) || previ == BIN(putstring) ||
previ == BIN(duparray)) {
/* just push operand or static value and pop soon, no
* side effects */
REMOVE_ELEM(prev);
REMOVE_ELEM(&iobj->link);
}
else if (previ == BIN(newarray) && iseq_pop_newarray(iseq, (INSN*)prev)) {
REMOVE_ELEM(&iobj->link);
}
}
}