diff options
Diffstat (limited to 'vm_trace.c')
| -rw-r--r-- | vm_trace.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/vm_trace.c b/vm_trace.c index 743524b0b8..ad0fce0713 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -279,8 +279,8 @@ exec_hooks(rb_thread_t *th, rb_hook_list_t *list, const rb_trace_arg_t *trace_ar return state; } -void -rb_threadptr_exec_event_hooks(rb_trace_arg_t *trace_arg) +static void +rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p) { rb_thread_t *th = trace_arg->th; if (th->trace_arg == 0 && @@ -316,12 +316,25 @@ rb_threadptr_exec_event_hooks(rb_trace_arg_t *trace_arg) th->vm->trace_running--; if (state) { + if (pop_p) th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp); TH_JUMP_TAG(th, state); } th->state = outer_state; } } +void +rb_threadptr_exec_event_hooks_and_pop_frame(rb_trace_arg_t *trace_arg) +{ + rb_threadptr_exec_event_hooks_orig(trace_arg, 1); +} + +void +rb_threadptr_exec_event_hooks(rb_trace_arg_t *trace_arg) +{ + rb_threadptr_exec_event_hooks_orig(trace_arg, 0); +} + VALUE rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg) { |