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_4@61440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-12-24 03:01:35 +00:00
parent 1a3bca1dd6
commit 04aa6a8168
3 changed files with 26 additions and 24 deletions

2
load.c
View file

@ -626,6 +626,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;