зеркало из https://github.com/github/ruby.git
* vm_eval.c (rb_catch_protect): use THROW_DATA_VAL().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
b8fa8865ee
Коммит
a74fe7546d
|
@ -1,3 +1,7 @@
|
|||
Wed Mar 11 05:06:46 2015 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* vm_eval.c (rb_catch_protect): use THROW_DATA_VAL().
|
||||
|
||||
Wed Mar 11 04:56:04 2015 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* vm_insnhelper.h: define struct IFUNC.
|
||||
|
|
|
@ -1995,7 +1995,7 @@ rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr)
|
|||
/* call with argc=1, argv = [tag], block = Qnil to insure compatibility */
|
||||
val = (*func)(tag, data, 1, (const VALUE *)&tag, Qnil);
|
||||
}
|
||||
else if (state == TAG_THROW && RNODE(th->errinfo)->u1.value == tag) {
|
||||
else if (state == TAG_THROW && THROW_DATA_VAL((struct THROW_DATA *)th->errinfo) == tag) {
|
||||
rb_vm_rewind_cfp(th, saved_cfp);
|
||||
val = th->tag->retval;
|
||||
th->errinfo = Qnil;
|
||||
|
|
Загрузка…
Ссылка в новой задаче