summaryrefslogtreecommitdiff
path: root/vm_trace.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-13 08:50:11 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-13 08:50:11 (GMT)
commitddae6a05d7442f25ac04eb3338ffa8a8b4895d3f (patch)
tree5a69624215e1a163a8ff7bcc583aa43edcdb1b60 /vm_trace.c
parent537b4a64227aebf357a5c3f570e01be5f2f824fd (diff)
* vm_trace.c: clear and restore recursive checking thread local data
to avoid unexpected throw from TracePoint. [Bug #9940] * test/ruby/test_settracefunc.rb: add a test. * thread.c: adde * rb_threadptr_reset_recursive_data(rb_thread_t *th); * rb_threadptr_restore_recursive_data(rb_thread_t *th, VALUE old); * vm_core.h: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_trace.c')
-rw-r--r--vm_trace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vm_trace.c b/vm_trace.c
index a562619..fe10abf 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -331,6 +331,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
trace_arg->self != rb_mRubyVMFrozenCore /* skip special methods. TODO: remove it. */) {
const VALUE errinfo = th->errinfo;
const int outer_state = th->state;
+ const VALUE old_recursive = rb_threadptr_reset_recursive_data(th);
int state = 0;
th->state = 0;
th->errinfo = Qnil;
@@ -351,6 +352,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
terminate:
th->trace_arg = 0;
th->vm->trace_running--;
+ rb_threadptr_restore_recursive_data(th, old_recursive);
if (state) {
if (pop_p) {