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

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;
     }
 }