diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 18:45:43 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 18:45:43 +0000 |
commit | 63d0ea4c03616e1f6f7e4be41c5de4cbb0a3a68e (patch) | |
tree | ed1cc95f95811b3e72704abeb09db66104a0d768 /vm_trace.c | |
parent | 8dafe8c88df357cc1a26a6b565bf9efa625da204 (diff) | |
download | ruby-63d0ea4c03616e1f6f7e4be41c5de4cbb0a3a68e.tar.gz |
vm.c: pass exceptions while handling an exception
* vm.c (vm_exec): pass exceptions while handling an exception.
* vm_trace.c (rb_threadptr_exec_event_hooks): propagate exceptions.
revert r38293 partially.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_trace.c')
-rw-r--r-- | vm_trace.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vm_trace.c b/vm_trace.c index 161c5d1528..717723c635 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -309,11 +309,15 @@ rb_threadptr_exec_event_hooks(rb_trace_arg_t *targ) state = exec_hooks(th, list, targ, !vm_tracing); if (state) goto terminate; } + th->errinfo = errinfo; } terminate: - th->errinfo = errinfo; th->trace_running = 0; th->vm->trace_running = vm_tracing; + + if (state) { + TH_JUMP_TAG(th, state); + } th->state = outer_state; } } |