diff options
| author | dearblue <[email protected]> | 2021-01-10 10:57:59 +0900 |
|---|---|---|
| committer | dearblue <[email protected]> | 2021-01-10 13:33:17 +0900 |
| commit | 9877f4ca3c10e21b9d525256fe8cebc4ea404727 (patch) | |
| tree | 9abccdfb0653b67c3af001a2f0ce0dd8d3192e14 | |
| parent | ced89c25ffc9ac748dc2dd336cce24d080ebf419 (diff) | |
| download | mruby-9877f4ca3c10e21b9d525256fe8cebc4ea404727.tar.gz mruby-9877f4ca3c10e21b9d525256fe8cebc4ea404727.zip | |
Revert "Save&restore execution point (`pc`) in `c->cibase->pc`; fix #5261"
This reverts commit a0c1e075e35c358d21934c28ff1bec4153502409.
This is because the `mrb_callinfo::pc` has been reorganized, resulting in over-correction.
| -rw-r--r-- | mrbgems/mruby-fiber/src/fiber.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mrbgems/mruby-fiber/src/fiber.c b/mrbgems/mruby-fiber/src/fiber.c index 7fd755843..44125598e 100644 --- a/mrbgems/mruby-fiber/src/fiber.c +++ b/mrbgems/mruby-fiber/src/fiber.c @@ -229,7 +229,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->cibase->pc); + value = mrb_vm_exec(mrb, c->ci->proc, c->ci->pc); mrb->c = old_c; } else { @@ -355,7 +355,6 @@ 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); |