From 4b39eaf4cc9c8be71695b878e90bb473a56d8494 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 20 May 2017 10:27:27 +0000 Subject: [PATCH] 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 --- compile.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compile.c b/compile.c index 7d42cc603c..bfdcb959ed 100644 --- a/compile.c +++ b/compile.c @@ -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: