diff options
Diffstat (limited to 'load.c')
| -rw-r--r-- | load.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -586,7 +586,7 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap) rb_thread_t *volatile th0 = th; #endif - th->errinfo = Qnil; /* ensure */ + th->ec.errinfo = Qnil; /* ensure */ if (!wrap) { th->top_wrapper = 0; @@ -628,11 +628,11 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap) if (state) { VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef); if (NIL_P(exc)) return state; - th->errinfo = exc; + th->ec.errinfo = exc; return TAG_RAISE; } - if (!NIL_P(th->errinfo)) { + if (!NIL_P(th->ec.errinfo)) { /* exception during load */ return TAG_RAISE; } @@ -645,7 +645,7 @@ rb_load_internal(VALUE fname, int wrap) rb_thread_t *curr_th = GET_THREAD(); int state = rb_load_internal0(curr_th, fname, wrap); if (state) { - if (state == TAG_RAISE) rb_exc_raise(curr_th->errinfo); + if (state == TAG_RAISE) rb_exc_raise(curr_th->ec.errinfo); TH_JUMP_TAG(curr_th, state); } } @@ -960,7 +960,7 @@ rb_require_internal(VALUE fname, int safe) { volatile int result = -1; rb_thread_t *th = GET_THREAD(); - volatile VALUE errinfo = th->errinfo; + volatile VALUE errinfo = th->ec.errinfo; enum ruby_tag_type state; struct { int safe; @@ -1021,7 +1021,7 @@ rb_require_internal(VALUE fname, int safe) return state; } - th->errinfo = errinfo; + th->ec.errinfo = errinfo; RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname)); |