From 8dd9c12c585375cc9d89441d7518a7846044deb0 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 28 Jun 2017 14:27:49 +0000 Subject: move fields to ec. * vm_core.h (rb_thread.h): move errinfo and trace_arg to rb_execution_context_t. * cont.c (fiber_switch, rb_cont_call): do not restore "trace_arg" here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval_error.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'eval_error.c') diff --git a/eval_error.c b/eval_error.c index 4340f60676..fe6bae1145 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->errinfo); + rb_threadptr_error_print(th, th->ec.errinfo); } static void @@ -202,7 +202,7 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo) } error: TH_POP_TAG(); - th->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->errinfo; + VALUE errinfo = th->ec.errinfo; if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) { status = sysexit_status(errinfo); } -- cgit v1.2.3