From 837fd5e494731d7d44786f29e7d6e8c27029806f Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 26 Oct 2017 08:32:49 +0000 Subject: Use rb_execution_context_t instead of rb_thread_t to represent execution context [Feature #14038] * vm_core.h (rb_thread_t): rb_thread_t::ec is now a pointer. There are many code using `th` to represent execution context (such as cfp, VM stack and so on). To access `ec`, they need to use `th->ec->...` (adding one indirection) so that we need to replace them by passing `ec` instead of `th`. * vm_core.h (GET_EC()): introduced to access current ec. Also remove `ruby_current_thread` global variable. * cont.c (rb_context_t): introduce rb_context_t::thread_ptr instead of rb_context_t::thread_value. * cont.c (ec_set_vm_stack): added to update vm_stack explicitly. * cont.c (ec_switch): added to switch ec explicitly. * cont.c (rb_fiber_close): added to terminate fibers explicitly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval_error.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'eval_error.c') diff --git a/eval_error.c b/eval_error.c index fe6bae1145..274b2f8ec6 100644 --- a/eval_error.c +++ b/eval_error.c @@ -69,7 +69,7 @@ set_backtrace(VALUE info, VALUE bt) static void error_print(rb_thread_t *th) { - rb_threadptr_error_print(th, th->ec.errinfo); + rb_threadptr_error_print(th, th->ec->errinfo); } static void @@ -167,7 +167,7 @@ void rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo) { volatile VALUE errat = Qundef; - volatile int raised_flag = th->ec.raised_flag; + volatile int raised_flag = th->ec->raised_flag; volatile VALUE eclass = Qundef, emesg = Qundef; if (NIL_P(errinfo)) @@ -202,7 +202,7 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo) } error: TH_POP_TAG(); - th->ec.errinfo = errinfo; + th->ec->errinfo = errinfo; rb_thread_raised_set(th, raised_flag); } @@ -304,7 +304,7 @@ error_handle(int ex) warn_print("unexpected throw\n"); break; case TAG_RAISE: { - VALUE errinfo = th->ec.errinfo; + VALUE errinfo = th->ec->errinfo; if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) { status = sysexit_status(errinfo); } -- cgit v1.2.3