admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not raise an exception for living closure; ref #3359

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-04-20 13:14:01 +09:00
parent 6a0b68f8b8
commit edd9fc6e75
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+10 -2
View File
@@ -1828,7 +1828,7 @@ RETRY_TRY_BLOCK:
ci = mrb->c->ci;
break;
case OP_R_BREAK:
if (ci->acc < 0 || !proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
if (!proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
mrb_value exc;
L_BREAK_ERROR:
@@ -1843,8 +1843,16 @@ RETRY_TRY_BLOCK:
mrb->c = c->prev;
c->prev = NULL;
ci = mrb->c->ci;
}
if (ci->acc < 0) {
while (eidx > mrb->c->ci[-1].eidx) {
ecall(mrb, --eidx);
}
mrb->c->vmexec = FALSE;
mrb->jmp = prev_jmp;
return v;
}
ci = mrb->c->ci;
mrb->c->stack = ci->stackent;
mrb->c->ci = mrb->c->cibase + proc->env->cioff + 1;
while (ci > mrb->c->ci) {