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

Merge pull request #6128 from dearblue/fiber-end

Browse Source 
Integrates the sequence when a fiber is terminated by `OP_RETURN`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-12-27 22:24:01 +09:00
committed by GitHub
parent e51c20888b dba1dcdd25
commit a8b82bfae5
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+12 -16
View File
@@ -2340,28 +2340,18 @@ RETRY_TRY_BLOCK:
NORMAL_RETURN:
ci = mrb->c->ci;
v = regs[a];
mrb_gc_protect(mrb, v);
if (ci == mrb->c->cibase) {
struct mrb_context *c;
c = mrb->c;
if (!c->prev) {
if (c != mrb->root_c) {
/* fiber termination should transfer to root */
c->prev = mrb->root_c;
}
else { /* toplevel return */
regs[irep->nlocals] = v;
goto CHECKPOINT_LABEL_MAKE(RBREAK_TAG_STOP);
}
}
else if (!c->vmexec && c->prev->ci == c->prev->cibase) {
if (c->prev && !c->vmexec && c->prev->ci == c->prev->cibase) {
RAISE_LIT(mrb, E_FIBER_ERROR, "double resume");
}
}
v = regs[a];
mrb_gc_protect(mrb, v);
CHECKPOINT_RESTORE(RBREAK_TAG_BREAK) {
if (TRUE) {
struct RBreak *brk = (struct RBreak*)mrb->exc;
@@ -2398,11 +2388,17 @@ RETRY_TRY_BLOCK:
if (ci == mrb->c->cibase) {
struct mrb_context *c = mrb->c;
/* automatic yield at the end */
if (c == mrb->root_c) {
/* toplevel return */
regs[irep->nlocals] = v;
goto L_STOP;
}
/* fiber termination should automatic yield or transfer to root */
c->status = MRB_FIBER_TERMINATED;
mrb->c = c->prev;
mrb->c->status = MRB_FIBER_RUNNING;
mrb->c = c->prev ? c->prev : mrb->root_c;
c->prev = NULL;
mrb->c->status = MRB_FIBER_RUNNING;
if (c->vmexec) {
mrb_gc_arena_restore(mrb, ai);
c->vmexec = FALSE;