diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-01 01:47:14 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-01 01:47:14 +0000 |
commit | 4130969ea19835d0a69a69ee6ffc7fa3dfedb675 (patch) | |
tree | 2a25320ec10245b480db9af9766e4a97c8acc92d /compile.c | |
parent | 04dec2df733a7ca1cf895be3e82ad3b0cf374741 (diff) | |
download | ruby-4130969ea19835d0a69a69ee6ffc7fa3dfedb675.tar.gz |
Revert r66670 because of wrong ticket number
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
-rw-r--r-- | compile.c | 18 |
1 files changed, 4 insertions, 14 deletions
@@ -7462,10 +7462,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in DECL_ANCHOR(args); unsigned int flag = 0; ID mid = node->nd_mid; - LABEL *else_label = 0; - LABEL *end_label = 0; + LABEL *lskip = 0; VALUE argc; - VALUE branches = 0; /* optimization shortcut * obj["literal"] = value -> opt_aset_with(obj, "literal", value) @@ -7505,11 +7503,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in /* safe nav attr */ mid = rb_id_attrset(mid); ADD_INSN(recv, line, dup); - else_label = NEW_LABEL(line); - end_label = NEW_LABEL(line); - DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "&."); - ADD_INSNL(recv, line, branchnil, else_label); - ADD_TRACE_BRANCH_COVERAGE(recv, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "then", branches); + lskip = NEW_LABEL(line); + ADD_INSNL(recv, line, branchnil, lskip); } if (!popped) { ADD_INSN(ret, line, putnil); @@ -7541,12 +7536,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in ADD_SEQ(ret, args); } ADD_SEND_WITH_FLAG(ret, line, mid, argc, INT2FIX(flag)); - if (else_label && end_label) { - ADD_INSNL(ret, line, jump, end_label); - ADD_LABEL(ret, else_label); - ADD_TRACE_BRANCH_COVERAGE(ret, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches); - ADD_LABEL(ret, end_label); - } + if (lskip) ADD_LABEL(ret, lskip); ADD_INSN(ret, line, pop); break; |