From e79ad682daaea5d61d1f1fac29784374f14be257 Mon Sep 17 00:00:00 2001 From: mame Date: Wed, 10 Feb 2010 16:46:39 +0000 Subject: * vm.c (vm_exec): temporarily revert r26628, which causes SEGV when executing rubyspec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d9d052ed2..5f1c3d0caf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 11 01:45:04 2010 Yusuke Endoh + + * vm.c (vm_exec): temporarily revert r26628, which causes SEGV when + executing rubyspec. + Wed Feb 10 16:31:03 2010 Nobuyoshi Nakada * array.c (rb_ary_push_m, rb_ary_unshift_m, rb_ary_aset), diff --git a/vm.c b/vm.c index 5f61c6c99c..1cee983351 100644 --- a/vm.c +++ b/vm.c @@ -1121,8 +1121,6 @@ vm_exec(rb_thread_t *th) _tag.retval = Qnil; if ((state = EXEC_TAG()) == 0) { vm_loop_start: - th->state = 0; - th->errinfo = Qnil; result = vm_exec_core(th, initial); if ((state = th->state) != 0) { err = result; @@ -1191,6 +1189,7 @@ vm_exec(rb_thread_t *th) #else *th->cfp->sp++ = (GET_THROWOBJ_VAL(err)); #endif + th->errinfo = Qnil; goto vm_loop_start; } } @@ -1227,6 +1226,7 @@ vm_exec(rb_thread_t *th) escape_dfp = GET_THROWOBJ_CATCH_POINT(err); if (cfp->dfp == escape_dfp) { cfp->pc = cfp->iseq->iseq_encoded + entry->cont; + th->errinfo = Qnil; goto vm_loop_start; } } @@ -1258,6 +1258,7 @@ vm_exec(rb_thread_t *th) *th->cfp->sp++ = (GET_THROWOBJ_VAL(err)); #endif } + th->errinfo = Qnil; goto vm_loop_start; } } @@ -1301,6 +1302,8 @@ vm_exec(rb_thread_t *th) cfp->self, (VALUE)cfp->dfp, catch_iseq->iseq_encoded, cfp->sp + 1 /* push value */, cfp->lfp, catch_iseq->local_size - 1); + state = 0; + th->errinfo = Qnil; goto vm_loop_start; } else { -- cgit v1.2.3