summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-28 10:59:37 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-28 10:59:37 +0000
commit874d6b329ec85d9109e79e3caca4ab15a4ec0638 (patch)
tree9832ab99f7dfc9ff8c4ebf738d9f83c1faace35d /vm.c
parente6956c048a5c082fc643096e32e37cf1f6d77db1 (diff)
`th` -> `ec` for vm_iter_break().
* vm.c (vm_iter_break): accepts `ec` instead of `th`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/vm.c b/vm.c
index bfb14c0975..cd170441ac 100644
--- a/vm.c
+++ b/vm.c
@@ -1461,8 +1461,6 @@ rb_vm_jump_tag_but_local_jump(int state)
}
#endif
-NORETURN(static void vm_iter_break(rb_thread_t *th, VALUE val));
-
static rb_control_frame_t *
next_not_local_frame(rb_control_frame_t *cfp)
{
@@ -1472,12 +1470,14 @@ next_not_local_frame(rb_control_frame_t *cfp)
return cfp;
}
+NORETURN(static void vm_iter_break(rb_execution_context_t *ec, VALUE val));
+
static void
-vm_iter_break(rb_thread_t *th, VALUE val)
+vm_iter_break(rb_execution_context_t *ec, VALUE val)
{
- rb_control_frame_t *cfp = next_not_local_frame(th->ec->cfp);
+ rb_control_frame_t *cfp = next_not_local_frame(ec->cfp);
const VALUE *ep = VM_CF_PREV_EP(cfp);
- const rb_control_frame_t *target_cfp = rb_vm_search_cf_from_ep(th->ec, cfp, ep);
+ const rb_control_frame_t *target_cfp = rb_vm_search_cf_from_ep(ec, cfp, ep);
#if 0 /* raise LocalJumpError */
if (!target_cfp) {
@@ -1485,20 +1485,20 @@ vm_iter_break(rb_thread_t *th, VALUE val)
}
#endif
- th->ec->errinfo = (VALUE)THROW_DATA_NEW(val, target_cfp, TAG_BREAK);
- EC_JUMP_TAG(th->ec, TAG_BREAK);
+ ec->errinfo = (VALUE)THROW_DATA_NEW(val, target_cfp, TAG_BREAK);
+ EC_JUMP_TAG(ec, TAG_BREAK);
}
void
rb_iter_break(void)
{
- vm_iter_break(GET_THREAD(), Qnil);
+ vm_iter_break(GET_EC(), Qnil);
}
void
rb_iter_break_value(VALUE val)
{
- vm_iter_break(GET_THREAD(), val);
+ vm_iter_break(GET_EC(), val);
}
/* optimization: redefine management */