diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-20 10:27:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-20 10:27:27 +0000 |
| commit | 4b39eaf4cc9c8be71695b878e90bb473a56d8494 (patch) | |
| tree | 9052099bf0d320c315bd1201960091993bcd0886 /compile.c | |
| parent | 82092f4bb78a2e4b43652b2f1d77c87446f837b8 (diff) | |
compile.c: binary logop check
* compile.c (compile_branch_condition): turn recursion at binary
logical operator into loop by goto, and check the result of RHS
of NODE_OR.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
| -rw-r--r-- | compile.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -2902,6 +2902,7 @@ static int compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond, LABEL *then_label, LABEL *else_label) { + again: switch (nd_type(cond)) { case NODE_AND: { @@ -2909,9 +2910,8 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond, CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, label, else_label)); ADD_LABEL(ret, label); - CHECK(compile_branch_condition(iseq, ret, cond->nd_2nd, then_label, - else_label)); - break; + cond = cond->nd_2nd; + goto again; } case NODE_OR: { @@ -2919,9 +2919,8 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond, CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, then_label, label)); ADD_LABEL(ret, label); - compile_branch_condition(iseq, ret, cond->nd_2nd, then_label, - else_label); - break; + cond = cond->nd_2nd; + goto again; } case NODE_LIT: /* NODE_LIT is always true */ case NODE_TRUE: |