From 2db081b5ffb07a2e6bdac58122fa3466830b12a9 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Thu, 1 Oct 2020 20:22:55 +1300 Subject: Don't use `th->scheduler` directly because it's not always valid to do so. --- thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 81172dc7b1..6cc0a9227e 100644 --- a/thread.c +++ b/thread.c @@ -1175,8 +1175,10 @@ thread_join_sleep(VALUE arg) } while (target_th->status != THREAD_KILLED) { - if (th->scheduler != Qnil) { - rb_scheduler_block(th->scheduler, target_th->self, p->timeout); + VALUE scheduler = rb_thread_current_scheduler(); + + if (scheduler != Qnil) { + rb_scheduler_block(scheduler, target_th->self, p->timeout); } else if (!limit) { th->status = THREAD_STOPPED_FOREVER; rb_ractor_sleeper_threads_inc(th->ractor); -- cgit v1.2.3