From 91e4978bb0f1fac38226733324828599e7359484 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 31 Jan 2018 13:24:42 +0000 Subject: merge revision(s) 60024: [Backport #13945] vm.c: fetch retval iff necessary * vm.c (rb_vm_make_jump_tag_but_local_jump): get rid of fetching retval when it is not used. it is necessary for local jump state only. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ load.c | 2 ++ version.h | 2 +- vm.c | 24 +++++++++++------------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8acff6909c..263a360313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jan 31 22:24:05 2018 Nobuyoshi Nakada + + vm.c: fetch retval iff necessary + + * vm.c (rb_vm_make_jump_tag_but_local_jump): get rid of fetching + retval when it is not used. it is necessary for local jump + state only. + Wed Jan 31 22:16:00 2018 Nobuyoshi Nakada compile.c: fix stack consitency error diff --git a/load.c b/load.c index 70c734595e..e520f116b6 100644 --- a/load.c +++ b/load.c @@ -629,6 +629,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->errinfo = exc; diff --git a/version.h b/version.h index 6061bb15cf..b169508147 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-01-31" -#define RUBY_PATCHLEVEL 397 +#define RUBY_PATCHLEVEL 398 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 1 diff --git a/vm.c b/vm.c index 1c00fe7499..89cd1c2f12 100644 --- a/vm.c +++ b/vm.c @@ -1310,33 +1310,31 @@ 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()->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"; break; case TAG_RETRY: - result = make_localjump_error("retry outside of rescue clause", Qnil, state); + mesg = "retry outside of rescue clause"; break; default: - break; + return Qnil; } - return result; + if (val == Qundef) { + val = GET_THREAD()->tag->retval; + } + return make_localjump_error(mesg, val, state); } void -- cgit v1.2.3