summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authorAlan Wu <XrXr@users.noreply.github.com>2020-03-11 10:37:14 -0400
committerNARUSE, Yui <naruse@airemix.jp>2020-03-30 19:15:11 +0900
commitb5fa156b7907b8ea1baf8b9f0cb6a66b0fecb3d4 (patch)
treee2551a6cc79b035f1a74e82da2703822e4c08086 /eval.c
parent0057fe4063b57b445d6ffc893e442f362e3a19e0 (diff)
Clear all trace events during teardown
Since 0c2d81dada, not all trace events are cleared during VM teardown. This causes a crash when there is a tracepoint for `RUBY_INTERNAL_EVENT_GC_EXIT` active during teardown. The commit looks like a refactoring commit so I think this change was unintentional. [Bug #16682] (cherry picked from commit b385f7670ffa420790bc548747fa4b58c4c5d8f6)
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/eval.c b/eval.c
index f2fde81e19..08f7ba97de 100644
--- a/eval.c
+++ b/eval.c
@@ -26,6 +26,7 @@
NORETURN(void rb_raise_jump(VALUE, VALUE));
void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
+void rb_ec_clear_all_trace_func(const rb_execution_context_t *ec);
static int rb_ec_cleanup(rb_execution_context_t *ec, volatile int ex);
static int rb_ec_exec_node(rb_execution_context_t *ec, void *n);
@@ -140,7 +141,7 @@ rb_ec_teardown(rb_execution_context_t *ec)
}
EC_POP_TAG();
rb_ec_exec_end_proc(ec);
- rb_ec_clear_current_thread_trace_func(ec);
+ rb_ec_clear_all_trace_func(ec);
}
static void