diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-01-08 20:58:37 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-01-08 21:03:41 +0900 |
| commit | a0c1e075e35c358d21934c28ff1bec4153502409 (patch) | |
| tree | ffb28b12dd44eb6be70a3ffcd6224cf4f9c00c77 /mrbgems | |
| parent | 04561cd999431264e10bb96915a26049cff29d92 (diff) | |
| download | mruby-a0c1e075e35c358d21934c28ff1bec4153502409.tar.gz mruby-a0c1e075e35c358d21934c28ff1bec4153502409.zip | |
Save&restore execution point (`pc`) in `c->cibase->pc`; fix #5261
`mrb_fiber_resume()` can be called from C; ref #3056
Diffstat (limited to 'mrbgems')
| -rw-r--r-- | mrbgems/mruby-fiber/src/fiber.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mrbgems/mruby-fiber/src/fiber.c b/mrbgems/mruby-fiber/src/fiber.c index 5567ed6cf..006aed50f 100644 --- a/mrbgems/mruby-fiber/src/fiber.c +++ b/mrbgems/mruby-fiber/src/fiber.c @@ -231,7 +231,7 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr if (vmexec) { c->vmexec = TRUE; - value = mrb_vm_exec(mrb, c->ci->proc, c->ci->pc); + value = mrb_vm_exec(mrb, c->ci->proc, c->cibase->pc); mrb->c = old_c; } else { @@ -357,6 +357,7 @@ mrb_fiber_yield(mrb_state *mrb, mrb_int len, const mrb_value *a) if (c->vmexec) { c->vmexec = FALSE; mrb->c->ci->acc = CI_ACC_RESUMED; + c->cibase->pc = c->ci->pc; c->ci--; /* pop callinfo for yield */ } MARK_CONTEXT_MODIFY(mrb->c); |