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

compile.c: optimize nested string interpolations

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-11-09 08:27:01 +00:00
parent 1c5ae5a163
commit 7b1f3906a0
1 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
compile.c
View File

@ -2605,6 +2605,48 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
} }
} }
if (IS_INSN_ID(iobj, putstring) ||
(IS_INSN_ID(iobj, putobject) && RB_TYPE_P(OPERAND_AT(iobj, 0), T_STRING))) {
if (IS_NEXT_INSN_ID(&iobj->link, concatstrings) &&
RSTRING_LEN(OPERAND_AT(iobj, 0)) == 0) {
INSN *next = (INSN *)iobj->link.next;
if ((OPERAND_AT(next, 0) = FIXNUM_INC(OPERAND_AT(next, 0), -1)) == INT2FIX(1)) {
REMOVE_ELEM(&next->link);
}
REMOVE_ELEM(&iobj->link);
}
}
if (IS_INSN_ID(iobj, concatstrings)) {
LINK_ELEMENT *next = iobj->link.next, *freeze = 0;
INSN *jump = 0;
if (IS_INSN(next) && IS_INSN_ID(next, freezestring))
next = (freeze = next)->next;
if (IS_INSN(next) && IS_INSN_ID(next, jump))
next = get_destination_insn(jump = (INSN *)next);
if (IS_INSN(next) && IS_INSN_ID(next, concatstrings)) {
int n = FIX2INT(OPERAND_AT(iobj, 0)) + FIX2INT(OPERAND_AT(next, 0)) - 1;
OPERAND_AT(iobj, 0) = INT2FIX(n);
if (jump) {
LABEL *label = ((LABEL *)OPERAND_AT(jump, 0));
if (!--label->refcnt) {
REMOVE_ELEM(&label->link);
}
else {
label = NEW_LABEL(0);
OPERAND_AT(jump, 0) = (VALUE)label;
}
label->refcnt++;
INSERT_ELEM_NEXT(next, &label->link);
CHECK(iseq_peephole_optimize(iseq, get_next_insn(jump), do_tailcallopt));
}
else {
if (freeze) REMOVE_ELEM(freeze);
REMOVE_ELEM(next);
}
}
}
if (do_tailcallopt && if (do_tailcallopt &&
(IS_INSN_ID(iobj, send) || (IS_INSN_ID(iobj, send) ||
IS_INSN_ID(iobj, opt_aref_with) || IS_INSN_ID(iobj, opt_aref_with) ||
@ -3117,6 +3159,29 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
return COMPILE_OK; return COMPILE_OK;
} }
static int
all_string_result_p(const NODE *node)
{
if (!node) return FALSE;
switch (nd_type(node)) {
case NODE_STR: case NODE_DSTR:
return TRUE;
case NODE_IF: case NODE_UNLESS:
if (!node->nd_body || !node->nd_else) return FALSE;
if (all_string_result_p(node->nd_body))
return all_string_result_p(node->nd_else);
return FALSE;
case NODE_AND: case NODE_OR:
if (!node->nd_2nd)
return all_string_result_p(node->nd_1st);
if (!all_string_result_p(node->nd_1st))
return FALSE;
return all_string_result_p(node->nd_2nd);
default:
return FALSE;
}
}
static int static int
compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int *cntp) compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int *cntp)
{ {
@ -6344,7 +6409,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
if (popped) { if (popped) {
ADD_INSN(ret, line, pop); ADD_INSN(ret, line, pop);
} }
else { else if (!all_string_result_p(node->nd_body)) {
const unsigned int flag = VM_CALL_FCALL; const unsigned int flag = VM_CALL_FCALL;
LABEL *isstr = NEW_LABEL(line); LABEL *isstr = NEW_LABEL(line);
ADD_INSN(ret, line, dup); ADD_INSN(ret, line, dup);