summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-25 21:51:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-25 21:51:56 +0000
commitd352d0a0a7851bc3a8d0352bf25a15836ee92e93 (patch)
tree0855e92f25d88735eab2f4e5748146d2bc77145c /vm.c
parent4ea46ca0f577d6f7c4f2f0d488c7bf28579ab867 (diff)
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/trunk@60024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/vm.c b/vm.c
index a807d01140..aec75da9ef 100644
--- a/vm.c
+++ b/vm.c
@@ -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