git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2017-04-18 11:06:58 +00:00
Родитель ee4ce52d01
Коммит 4a8c235fed
2 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -1406,7 +1406,7 @@ opt_aset_with
VALUE tmp = vm_opt_aset_with(recv, key, val); VALUE tmp = vm_opt_aset_with(recv, key, val);
if (tmp != Qundef) { if (tmp != Qundef) {
val = tmp; val = tmp;
} }
else { else {
/* other */ /* other */

Просмотреть файл

@ -3244,13 +3244,13 @@ vm_once_dispatch(ISEQ iseq, IC ic, rb_thread_t *th)
return is->once.value; return is->once.value;
} }
else if (is->once.running_thread == NULL) { else if (is->once.running_thread == NULL) {
VALUE val; VALUE val;
is->once.running_thread = th; is->once.running_thread = th;
val = is->once.value = rb_ensure(vm_once_exec, (VALUE)iseq, vm_once_clear, (VALUE)is); val = is->once.value = rb_ensure(vm_once_exec, (VALUE)iseq, vm_once_clear, (VALUE)is);
/* is->once.running_thread is cleared by vm_once_clear() */ /* is->once.running_thread is cleared by vm_once_clear() */
is->once.running_thread = RUNNING_THREAD_ONCE_DONE; /* success */ is->once.running_thread = RUNNING_THREAD_ONCE_DONE; /* success */
rb_iseq_add_mark_object(th->cfp->iseq, val); rb_iseq_add_mark_object(th->cfp->iseq, val);
return val; return val;
} }
else if (is->once.running_thread == th) { else if (is->once.running_thread == th) {
/* recursive once */ /* recursive once */
@ -3260,7 +3260,7 @@ vm_once_dispatch(ISEQ iseq, IC ic, rb_thread_t *th)
/* waiting for finish */ /* waiting for finish */
RUBY_VM_CHECK_INTS(th); RUBY_VM_CHECK_INTS(th);
rb_thread_schedule(); rb_thread_schedule();
return vm_once_dispatch(iseq, ic, th); return vm_once_dispatch(iseq, ic, th);
} }
} }
@ -3424,7 +3424,7 @@ vm_opt_mod(VALUE recv, VALUE obj)
static inline int static inline int
vm_method_cfunc_is(CALL_INFO ci, CALL_CACHE cc, vm_method_cfunc_is(CALL_INFO ci, CALL_CACHE cc,
VALUE recv, VALUE (*func)()) VALUE recv, VALUE (*func)())
{ {
vm_search_method(ci, cc, recv); vm_search_method(ci, cc, recv);
return check_cfunc(cc->me, func); return check_cfunc(cc->me, func);