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

Add return_ci in CHECKPOINT_MAIN() of OP_RETURN

Browse Source 
For role clarity, distinguish between `ci` and `return_ci`.
This commit is contained in:
dearblue
2024-08-27 21:39:09 +09:00
parent 28ece4ed8b
commit 7ec5d47a91
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+11 -8
View File
@@ -2310,34 +2310,37 @@ RETRY_TRY_BLOCK:
CASE(OP_RETURN, B) {
mrb_int acc;
mrb_value v;
mrb_callinfo *return_ci;
NORMAL_RETURN:
ci = mrb->c->ci;
v = regs[a];
mrb_gc_protect(mrb, v);
return_ci = ci;
CHECKPOINT_RESTORE(RBREAK_TAG_BREAK) {
if (TRUE) {
struct RBreak *brk = (struct RBreak*)mrb->exc;
ci = &mrb->c->cibase[brk->ci_break_index];
return_ci = &mrb->c->cibase[brk->ci_break_index];
v = mrb_break_value_get(brk);
}
else {
L_UNWINDING:
v = mrb->c->ci->stack[a];
return_ci = ci;
ci = mrb->c->ci;
v = ci->stack[a];
}
mrb_gc_protect(mrb, v);
}
CHECKPOINT_MAIN(RBREAK_TAG_BREAK) {
for (;;) {
UNWIND_ENSURE(mrb, mrb->c->ci, mrb->c->ci->pc, RBREAK_TAG_BREAK, ci, v);
UNWIND_ENSURE(mrb, ci, ci->pc, RBREAK_TAG_BREAK, return_ci, v);
if (mrb->c->ci == ci) {
if (ci == return_ci) {
break;
}
cipop(mrb);
if (mrb->c->ci[1].cci != CINFO_NONE) {
ci = cipop(mrb);
if (ci[1].cci != CINFO_NONE) {
mrb_assert(prev_jmp != NULL);
mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, ci, v);
mrb->exc = (struct RObject*)break_new(mrb, RBREAK_TAG_BREAK, return_ci, v);
mrb_gc_arena_restore(mrb, ai);
mrb->c->vmexec = FALSE;
mrb->jmp = prev_jmp;