From cfd8c7e6ca9f923cee3a062b548d0824fc67e9a5 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Mon, 23 Nov 2020 23:47:58 -0800 Subject: Prefer calloc/free over ZALLOC/xfree To avoid SEGV like http://ci.rvm.jp/logfiles/brlog.trunk-mjit.20201124-061530 --- mjit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mjit.c') diff --git a/mjit.c b/mjit.c index 8f400f5f08..262298d6d4 100644 --- a/mjit.c +++ b/mjit.c @@ -183,7 +183,10 @@ mjit_cont_new(rb_execution_context_t *ec) { struct mjit_cont *cont; - cont = ZALLOC(struct mjit_cont); + // We need to use calloc instead of something like ZALLOC to avoid triggering GC here. + // When this function is called from rb_thread_alloc through rb_threadptr_root_fiber_setup, + // the thread is still being prepared and marking it causes SEGV. + cont = calloc(1, sizeof(struct mjit_cont)); cont->ec = ec; CRITICAL_SECTION_START(3, "in mjit_cont_new"); @@ -218,7 +221,7 @@ mjit_cont_free(struct mjit_cont *cont) } CRITICAL_SECTION_FINISH(3, "in mjit_cont_new"); - xfree(cont); + free(cont); } // Finish work with continuation info. -- cgit v1.2.3