diff options
Diffstat (limited to 'signal.c')
| -rw-r--r-- | signal.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -759,7 +759,7 @@ static const char *received_signal; #endif #if defined(USE_SIGALTSTACK) || defined(_WIN32) -NORETURN(void rb_threadptr_stack_overflow(rb_thread_t *th, int crit)); +NORETURN(void rb_ec_stack_overflow(rb_execution_context_t *ec, int crit)); # if defined __HAIKU__ # define USE_UCONTEXT_REG 1 # elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__)) @@ -838,17 +838,17 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx) * the fault page can be the next. */ if (sp_page == fault_page || sp_page == fault_page + 1 || sp_page <= fault_page && fault_page <= bp_page) { - rb_thread_t *th = ruby_current_thread(); + rb_execution_context_t *ec = GET_EC(); int crit = FALSE; - if ((uintptr_t)th->ec->tag->buf / pagesize <= fault_page + 1) { + if ((uintptr_t)ec->tag->buf / pagesize <= fault_page + 1) { /* drop the last tag if it is close to the fault, * otherwise it can cause stack overflow again at the same * place. */ - th->ec->tag = th->ec->tag->prev; + ec->tag = ec->tag->prev; crit = TRUE; } reset_sigmask(sig); - rb_threadptr_stack_overflow(th, crit); + rb_ec_stack_overflow(ec, crit); } } # else @@ -856,10 +856,10 @@ static void check_stack_overflow(int sig, const void *addr) { int ruby_stack_overflowed_p(const rb_thread_t *, const void *); - rb_thread_t *th = GET_THREAD(); - if (ruby_stack_overflowed_p(th, addr)) { + rb_execution_context_t *ec = GET_EC(); + if (ruby_stack_overflowed_p(ec, addr)) { reset_sigmask(sig); - rb_threadptr_stack_overflow(th, FALSE); + rb_ec_stack_overflow(ec, FALSE); } } # endif |