summaryrefslogtreecommitdiff
path: root/cont.c
diff options
context:
space:
mode:
authorSamuel Williams <samuel.williams@oriontransfer.co.nz>2019-06-20 15:30:29 +1200
committerSamuel Williams <samuel.williams@oriontransfer.co.nz>2019-06-20 15:30:29 +1200
commitc26c51449461e3c8ee9bb4e1800933fb3d3caf67 (patch)
treeec9566fe256fc77cbaf4d1cf685fccafb8fadd0a /cont.c
parent7d9d1ed463323fe28f24d0b94212c2cb7ad109bd (diff)
Revert failed attempt at fixing invalid usage of vm_stack.
Diffstat (limited to 'cont.c')
-rw-r--r--cont.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/cont.c b/cont.c
index b83a0ad94c..0c8a68fe9a 100644
--- a/cont.c
+++ b/cont.c
@@ -268,6 +268,13 @@ fiber_status_set(rb_fiber_t *fib, enum fiber_status s)
fib->status = s;
}
+void
+rb_ec_set_vm_stack(rb_execution_context_t *ec, VALUE *stack, size_t size)
+{
+ ec->vm_stack = stack;
+ ec->vm_stack_size = size;
+}
+
static inline void
ec_switch(rb_thread_t *th, rb_fiber_t *fib)
{
@@ -698,7 +705,7 @@ cont_capture(volatile int *volatile stat)
cont->saved_vm_stack.ptr = ALLOC_N(VALUE, ec->vm_stack_size);
MEMCPY(cont->saved_vm_stack.ptr, ec->vm_stack, VALUE, ec->vm_stack_size);
#endif
- rb_ec_clear_vm_stack(&cont->saved_ec);
+ rb_ec_set_vm_stack(&cont->saved_ec, NULL, 0);
cont_save_machine_stack(th, cont);
/* backup ensure_list to array for search in another context */
@@ -1786,7 +1793,7 @@ rb_fiber_close(rb_fiber_t *fib)
}
}
- rb_ec_clear_vm_stack(ec);
+ rb_ec_set_vm_stack(ec, NULL, 0);
#if !FIBER_USE_NATIVE
/* should not mark machine stack any more */