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 --- load.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'load.c') 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; -- cgit v1.2.3