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

compile.c: optimization of defined? in condition

Browse Source 
* compile.c (compile_branch_condition): trivial optimization of
  defined? expression in a branch condition, where a string is not
  needed, but just a boolean.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-20 04:27:55 +00:00
parent 2de1dbdffc
commit f81c1c24b8
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
compile.c
View File

@ -462,6 +462,8 @@ static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
static int iseq_set_exception_table(rb_iseq_t *iseq); static int iseq_set_exception_table(rb_iseq_t *iseq);
static int iseq_set_optargs_table(rb_iseq_t *iseq); static int iseq_set_optargs_table(rb_iseq_t *iseq);
static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, VALUE needstr);
/* /*
* To make Array to LinkedList, use link_anchor * To make Array to LinkedList, use link_anchor
*/ */
@ -2903,8 +2905,12 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond,
case NODE_FLIP3: case NODE_FLIP3:
CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label)); CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label));
break; break;
case NODE_DEFINED:
CHECK(compile_defined_expr(iseq, ret, cond, Qfalse));
goto branch;
default: default:
CHECK(COMPILE(ret, "branch condition", cond)); CHECK(COMPILE(ret, "branch condition", cond));
branch:
ADD_INSNL(ret, nd_line(cond), branchunless, else_label); ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
ADD_INSNL(ret, nd_line(cond), jump, then_label); ADD_INSNL(ret, nd_line(cond), jump, then_label);
break; break;
@ -3705,6 +3711,31 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
return done; return done;
} }
static int
compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, VALUE needstr)
{
const int line = nd_line(node);
if (!node->nd_head) {
VALUE str = rb_iseq_defined_string(DEFINED_NIL);
ADD_INSN1(ret, line, putobject, str);
}
else {
LABEL *lfinish[2];
LINK_ELEMENT *last = ret->last;
lfinish[0] = NEW_LABEL(line);
lfinish[1] = 0;
defined_expr(iseq, ret, node->nd_head, lfinish, needstr);
if (lfinish[1]) {
INSERT_ELEM_NEXT(last, &new_insn_body(iseq, line, BIN(putnil), 0)->link);
ADD_INSN(ret, line, swap);
ADD_INSN(ret, line, pop);
ADD_LABEL(ret, lfinish[1]);
}
ADD_LABEL(ret, lfinish[0]);
}
return COMPILE_OK;
}
static VALUE static VALUE
make_name_for_block(const rb_iseq_t *orig_iseq) make_name_for_block(const rb_iseq_t *orig_iseq)
{ {
@ -6112,28 +6143,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
} }
break; break;
} }
case NODE_DEFINED:{ case NODE_DEFINED:
if (popped) break; if (!popped) {
if (!node->nd_head) { CHECK(compile_defined_expr(iseq, ret, node, Qtrue));
VALUE str = rb_iseq_defined_string(DEFINED_NIL);
ADD_INSN1(ret, nd_line(node), putobject, str);
}
else {
LABEL *lfinish[2];
LINK_ELEMENT *last = ret->last;
lfinish[0] = NEW_LABEL(line);
lfinish[1] = 0;
defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
if (lfinish[1]) {
INSERT_ELEM_NEXT(last, &new_insn_body(iseq, line, BIN(putnil), 0)->link);
ADD_INSN(ret, line, swap);
ADD_INSN(ret, line, pop);
ADD_LABEL(ret, lfinish[1]);
}
ADD_LABEL(ret, lfinish[0]);
} }
break; break;
}
case NODE_POSTEXE:{ case NODE_POSTEXE:{
/* compiled to: /* compiled to:
* ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } } * ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }