1 files changed, 7 insertions, 0 deletions
diff --git a/cont.c b/cont.c
index 58b2d303ac..1d90a2bfcb 100644
--- a/cont.c
+++ b/cont.c
@@ -929,6 +929,9 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
     cont->argc = argc;
     cont->value = make_passing_arg(argc, argv);
 
+    /* restore `tracing' context. see [Feature #4347] */
+    th->trace_running = cont->saved_thread.trace_running;
+
     cont_restore_0(cont, &contval);
     return Qnil; /* unreachable */
 }
@@ -1317,6 +1320,10 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
     if (is_resume) {
 	fib->prev = rb_fiber_current();
     }
+    else {
+	/* restore `tracing' context. see [Feature #4347] */
+	th->trace_running = cont->saved_thread.trace_running;
+    }
 
     cont->argc = argc;
     cont->value = make_passing_arg(argc, argv);