kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

th -> ec for vm_iter_break().

Browse source 
* 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
This commit is contained in:
ko1 2017-10-28 10:59:37 +00:00
parent e6956c048a
commit 874d6b329e
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
vm.c
View file

@ -1461,8 +1461,6 @@ rb_vm_jump_tag_but_local_jump(int state)
} }
#endif #endif
NORETURN(static void vm_iter_break(rb_thread_t *th, VALUE val));
static rb_control_frame_t * static rb_control_frame_t *
next_not_local_frame(rb_control_frame_t *cfp) next_not_local_frame(rb_control_frame_t *cfp)
{ {
@ -1472,12 +1470,14 @@ next_not_local_frame(rb_control_frame_t *cfp)
return cfp; return cfp;
} }
NORETURN(static void vm_iter_break(rb_execution_context_t *ec, VALUE val));
static void 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 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 0 /* raise LocalJumpError */
if (!target_cfp) { if (!target_cfp) {
@ -1485,20 +1485,20 @@ vm_iter_break(rb_thread_t *th, VALUE val)
} }
#endif #endif
th->ec->errinfo = (VALUE)THROW_DATA_NEW(val, target_cfp, TAG_BREAK); ec->errinfo = (VALUE)THROW_DATA_NEW(val, target_cfp, TAG_BREAK);
EC_JUMP_TAG(th->ec, TAG_BREAK); EC_JUMP_TAG(ec, TAG_BREAK);
} }
void void
rb_iter_break(void) rb_iter_break(void)
{ {
vm_iter_break(GET_THREAD(), Qnil); vm_iter_break(GET_EC(), Qnil);
} }
void void
rb_iter_break_value(VALUE val) rb_iter_break_value(VALUE val)
{ {
vm_iter_break(GET_THREAD(), val); vm_iter_break(GET_EC(), val);
} }
/* optimization: redefine management */ /* optimization: redefine management */