Ensure execution context is cleared after thread is finished.

2 files changed, 1 insertions, 4 deletions

diff --git a/thread.c b/thread.c
index e910ccb510..f1f9ff82ac 100644
--- a/thread.c
+++ b/thread.c
@@ -821,7 +821,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
 	rb_threadptr_unlock_all_locking_mutexes(th);
 	rb_check_deadlock(th->vm);
 
-	// rb_fiber_close(th->ec->fiber_ptr);
+        rb_ec_set_vm_stack(th->ec, NULL, 0);
     }
     thread_cleanup_func(th, FALSE);
     gvl_release(th->vm);
diff --git a/vm.c b/vm.c
index f7b2515cec..b68e26fc3b 100644
--- a/vm.c
+++ b/vm.c
@@ -2704,9 +2704,6 @@ th_init(rb_thread_t *th, VALUE self)
             0 /* dummy cref/me */,
             0 /* dummy pc */, th->ec->vm_stack, 0, 0
         );
-    } else {
-        th->ec->cfp = NULL;
-        rb_ec_set_vm_stack(th->ec, NULL, 0);
     }
 
     th->status = THREAD_RUNNABLE;