From f6c102e6a58cfd5f6ab2144e13727a074aef0b46 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 7 Nov 2017 06:09:47 +0000 Subject: th->ec: rb_threadptr_setup_exception * eval.c (rb_threadptr_setup_exception): renamed to rb_ec_setup_exception(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 642d48f81c..3cbb97dd37 100644 --- a/thread.c +++ b/thread.c @@ -2112,14 +2112,12 @@ rb_threadptr_ready(rb_thread_t *th) rb_threadptr_interrupt(th); } -void rb_threadptr_setup_exception(rb_thread_t *th, VALUE mesg, VALUE cause); - static VALUE -rb_threadptr_raise(rb_thread_t *th, int argc, VALUE *argv) +rb_threadptr_raise(rb_thread_t *target_th, int argc, VALUE *argv) { VALUE exc; - if (rb_threadptr_dead(th)) { + if (rb_threadptr_dead(target_th)) { return Qnil; } @@ -2132,13 +2130,13 @@ rb_threadptr_raise(rb_thread_t *th, int argc, VALUE *argv) /* making an exception object can switch thread, so we need to check thread deadness again */ - if (rb_threadptr_dead(th)) { + if (rb_threadptr_dead(target_th)) { return Qnil; } - rb_threadptr_setup_exception(GET_THREAD(), exc, Qundef); - rb_threadptr_pending_interrupt_enque(th, exc); - rb_threadptr_interrupt(th); + rb_ec_setup_exception(GET_EC(), exc, Qundef); + rb_threadptr_pending_interrupt_enque(target_th, exc); + rb_threadptr_interrupt(target_th); return Qnil; } -- cgit v1.2.3