* vm.c (vm_exec): reset thread state before restarting vm loop
from catch scope. [ruby-core:28129], [ruby-core:28143] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
aeed74a61a
commit
485c571bf1
@ -1,3 +1,8 @@
|
|||||||
|
Thu Feb 11 17:52:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* vm.c (vm_exec): reset thread state before restarting vm loop
|
||||||
|
from catch scope. [ruby-core:28129], [ruby-core:28143]
|
||||||
|
|
||||||
Thu Feb 11 14:43:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Thu Feb 11 14:43:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* marshal.c (r_object0): read sequentially since marshal source
|
* marshal.c (r_object0): read sequentially since marshal source
|
||||||
|
1
vm.c
1
vm.c
@ -1303,6 +1303,7 @@ vm_exec(rb_thread_t *th)
|
|||||||
cfp->sp + 1 /* push value */, cfp->lfp, catch_iseq->local_size - 1);
|
cfp->sp + 1 /* push value */, cfp->lfp, catch_iseq->local_size - 1);
|
||||||
|
|
||||||
state = 0;
|
state = 0;
|
||||||
|
th->state = 0;
|
||||||
th->errinfo = Qnil;
|
th->errinfo = Qnil;
|
||||||
goto vm_loop_start;
|
goto vm_loop_start;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user