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

Extract compile_op_log from iseq_compile_each0

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2017-03-12 12:55:43 +09:00
parent d045d5f860
commit 6cf9f17191
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2021-09-01 16:17:30 +09:00 
Merged: https://github.com/ruby/ruby/pull/4795
1 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
compile.c
View File

@ -8435,6 +8435,50 @@ compile_op_cdecl(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
return COMPILE_OK; return COMPILE_OK;
} }
static int
compile_op_log(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
{
const int line = nd_line(node);
LABEL *lfin = NEW_LABEL(line);
LABEL *lassign;
if (type == NODE_OP_ASGN_OR && nd_type(node->nd_head) != NODE_IVAR) {
LABEL *lfinish[2];
lfinish[0] = lfin;
lfinish[1] = 0;
defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
lassign = lfinish[1];
if (!lassign) {
lassign = NEW_LABEL(line);
}
ADD_INSNL(ret, node, branchunless, lassign);
}
else {
lassign = NEW_LABEL(line);
}
CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head));
ADD_INSN(ret, node, dup);
if (type == NODE_OP_ASGN_AND) {
ADD_INSNL(ret, node, branchunless, lfin);
}
else {
ADD_INSNL(ret, node, branchif, lfin);
}
ADD_INSN(ret, node, pop);
ADD_LABEL(ret, lassign);
CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value));
ADD_LABEL(ret, lfin);
if (popped) {
/* we can apply more optimize */
ADD_INSN(ret, node, pop);
}
return COMPILE_OK;
}
static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped); static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped);
/** /**
compile each node compile each node
@ -8668,46 +8712,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
CHECK(compile_op_cdecl(iseq, ret, node, popped)); CHECK(compile_op_cdecl(iseq, ret, node, popped));
break; break;
case NODE_OP_ASGN_AND: case NODE_OP_ASGN_AND:
case NODE_OP_ASGN_OR:{ case NODE_OP_ASGN_OR:
LABEL *lfin = NEW_LABEL(line); CHECK(compile_op_log(iseq, ret, node, popped, type));
LABEL *lassign;
if (nd_type(node) == NODE_OP_ASGN_OR && nd_type(node->nd_head) != NODE_IVAR) {
LABEL *lfinish[2];
lfinish[0] = lfin;
lfinish[1] = 0;
defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
lassign = lfinish[1];
if (!lassign) {
lassign = NEW_LABEL(line);
}
ADD_INSNL(ret, node, branchunless, lassign);
}
else {
lassign = NEW_LABEL(line);
}
CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head));
ADD_INSN(ret, node, dup);
if (nd_type(node) == NODE_OP_ASGN_AND) {
ADD_INSNL(ret, node, branchunless, lfin);
}
else {
ADD_INSNL(ret, node, branchif, lfin);
}
ADD_INSN(ret, node, pop);
ADD_LABEL(ret, lassign);
CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value));
ADD_LABEL(ret, lfin);
if (popped) {
/* we can apply more optimize */
ADD_INSN(ret, node, pop);
}
break; break;
}
case NODE_CALL: /* obj.foo */ case NODE_CALL: /* obj.foo */
case NODE_OPCALL: /* foo[] */ case NODE_OPCALL: /* foo[] */
if (compile_call_precheck_freeze(iseq, ret, node, node, popped) == TRUE) { if (compile_call_precheck_freeze(iseq, ret, node, node, popped) == TRUE) {