diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-10 16:46:39 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-10 16:46:39 +0000 |
| commit | e79ad682daaea5d61d1f1fac29784374f14be257 (patch) | |
| tree | a4a4757b4bf90d3e36b29d9411a7cab3456f3367 /vm.c | |
| parent | f3f43cdbee1703afd92f9f6dbb471642bcede9f5 (diff) | |
* 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
Diffstat (limited to 'vm.c')
| -rw-r--r-- | vm.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 { |