diff options
| -rw-r--r-- | load.c | 2 | ||||
| -rw-r--r-- | vm.c | 26 |
2 files changed, 15 insertions, 13 deletions
@@ -627,6 +627,8 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap) th->top_wrapper = wrapper; if (state) { + /* usually state == TAG_RAISE only, except for + * rb_iseq_load_iseq case */ VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef); if (NIL_P(exc)) return state; th->ec.errinfo = exc; @@ -1421,33 +1421,33 @@ rb_vm_localjump_error(const char *mesg, VALUE value, int reason) VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val) { - VALUE result = Qnil; + const char *mesg; - if (val == Qundef) { - val = GET_THREAD()->ec.tag->retval; - } switch (state) { - case 0: - break; case TAG_RETURN: - result = make_localjump_error("unexpected return", val, state); + mesg = "unexpected return"; break; case TAG_BREAK: - result = make_localjump_error("unexpected break", val, state); + mesg = "unexpected break"; break; case TAG_NEXT: - result = make_localjump_error("unexpected next", val, state); + mesg = "unexpected next"; break; case TAG_REDO: - result = make_localjump_error("unexpected redo", Qnil, state); + mesg = "unexpected redo"; + val = Qnil; break; case TAG_RETRY: - result = make_localjump_error("retry outside of rescue clause", Qnil, state); + mesg = "retry outside of rescue clause"; + val = Qnil; break; default: - break; + return Qnil; } - return result; + if (val == Qundef) { + val = GET_THREAD()->ec.tag->retval; + } + return make_localjump_error(mesg, val, state); } void |