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 #6136 from dearblue/fiber-fix

Browse Source 
Fixed when combined `mrb_fiber_resume()` and `Fiber#transfer`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2024-01-03 07:33:48 +09:00
committed by GitHub
parent 5257fe4333 519a2cbd59
commit f0ab79b195
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+2 -1
View File
@@ -2399,7 +2399,8 @@ RETRY_TRY_BLOCK:
mrb->c = c->prev ? c->prev : mrb->root_c;
c->prev = NULL;
mrb->c->status = MRB_FIBER_RUNNING;
if (c->vmexec) {
if (c->vmexec ||
(mrb->c == mrb->root_c && mrb->c->ci == mrb->c->cibase) /* case using Fiber#transfer in mrb_fiber_resume() */) {
mrb_gc_arena_restore(mrb, ai);
c->vmexec = FALSE;
mrb->jmp = prev_jmp;