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

compile_redo: do not goto into a branch

Browse Source 
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
This commit is contained in:
卜部昌平 2020-06-12 13:39:10 +09:00
parent cf29de7e6e
commit aa2cb7f722
Notes: git 2020-06-29 11:07:11 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compile.c
View File

@ -6708,12 +6708,7 @@ compile_redo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
ADD_INSN(ret, line, putnil); ADD_INSN(ret, line, putnil);
} }
} }
else if (iseq->body->type == ISEQ_TYPE_EVAL) { else if (iseq->body->type == ISEQ_TYPE_EVAL && ISEQ_COMPILE_DATA(iseq)->start_label) {
redo_in_eval:
COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
return COMPILE_NG;
}
else if (ISEQ_COMPILE_DATA(iseq)->start_label) {
LABEL *splabel = NEW_LABEL(0); LABEL *splabel = NEW_LABEL(0);
debugs("redo in block"); debugs("redo in block");
@ -6743,7 +6738,8 @@ compile_redo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
break; break;
} }
else if (ip->body->type == ISEQ_TYPE_EVAL) { else if (ip->body->type == ISEQ_TYPE_EVAL) {
goto redo_in_eval; COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
return COMPILE_NG;
} }
ip = ip->body->parent_iseq; ip = ip->body->parent_iseq;