Skip to content

Commit ebd6636

Browse files
committed
Call write barriers for stack-modified fibers; fix #3699
1 parent d7e09ff commit ebd6636

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

mrbgems/mruby-fiber/src/fiber.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,16 @@ fiber_check_cfunc(mrb_state *mrb, struct mrb_context *c)
171171
}
172172
}
173173

174+
static void
175+
fiber_switch_context(mrb_state *mrb, struct mrb_context *c)
176+
{
177+
if (mrb->c->fib) {
178+
mrb_write_barrier(mrb, (struct RBasic*)mrb->c->fib);
179+
}
180+
c->status = MRB_FIBER_RUNNING;
181+
mrb->c = c;
182+
}
183+
174184
static mrb_value
175185
fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mrb_bool resume, mrb_bool vmexec)
176186
{
@@ -207,9 +217,7 @@ fiber_switch(mrb_state *mrb, mrb_value self, mrb_int len, const mrb_value *a, mr
207217
else {
208218
value = fiber_result(mrb, a, len);
209219
}
210-
mrb_write_barrier(mrb, (struct RBasic*)c->fib);
211-
c->status = MRB_FIBER_RUNNING;
212-
mrb->c = c;
220+
fiber_switch_context(mrb, c);
213221

214222
if (vmexec) {
215223
c->vmexec = TRUE;
@@ -308,10 +316,8 @@ fiber_transfer(mrb_state *mrb, mrb_value self)
308316

309317
if (c == mrb->root_c) {
310318
mrb->c->status = MRB_FIBER_TRANSFERRED;
311-
mrb->c = c;
312-
c->status = MRB_FIBER_RUNNING;
319+
fiber_switch_context(mrb, c);
313320
MARK_CONTEXT_MODIFY(c);
314-
mrb_write_barrier(mrb, (struct RBasic*)c->fib);
315321
return fiber_result(mrb, a, len);
316322
}
317323

@@ -336,13 +342,12 @@ mrb_fiber_yield(mrb_state *mrb, mrb_int len, const mrb_value *a)
336342
fiber_check_cfunc(mrb, c);
337343
c->prev->status = MRB_FIBER_RUNNING;
338344
c->status = MRB_FIBER_SUSPENDED;
339-
mrb->c = c->prev;
345+
fiber_switch_context(mrb, c->prev);
340346
c->prev = NULL;
341347
if (c->vmexec) {
342348
c->vmexec = FALSE;
343349
mrb->c->ci->acc = CI_ACC_RESUMED;
344350
}
345-
mrb_write_barrier(mrb, (struct RBasic*)c->fib);
346351
MARK_CONTEXT_MODIFY(mrb->c);
347352
return fiber_result(mrb, a, len);
348353
}

src/vm.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,12 @@ mrb_vm_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int stac
867867
if (c->ci - c->cibase > cioff) {
868868
c->ci = c->cibase + cioff;
869869
}
870-
mrb->c = c;
870+
if (mrb->c != c) {
871+
if (mrb->c->fib) {
872+
mrb_write_barrier(mrb, (struct RBasic*)mrb->c->fib);
873+
}
874+
mrb->c = c;
875+
}
871876
return result;
872877
}
873878

@@ -1819,6 +1824,9 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
18191824
else {
18201825
struct mrb_context *c = mrb->c;
18211826

1827+
if (c->fib) {
1828+
mrb_write_barrier(mrb, (struct RBasic*)c->fib);
1829+
}
18221830
mrb->c = c->prev;
18231831
c->prev = NULL;
18241832
goto L_RAISE;

0 commit comments

Comments
 (0)