Skip to content

Commit 6f5f685

Browse files
authored
Call initialize_collection after _finish_julia_init (#40)
1 parent 9460689 commit 6f5f685

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/init.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -824,9 +824,6 @@ JL_DLLEXPORT void julia_init(JL_IMAGE_SEARCH rel)
824824

825825
jl_ptls_t ptls = jl_init_threadtls(0);
826826

827-
#ifdef MMTK_GC
828-
mmtk_initialize_collection((void *)ptls);
829-
#endif
830827
#pragma GCC diagnostic push
831828
#if defined(_COMPILER_GCC_) && __GNUC__ >= 12
832829
#pragma GCC diagnostic ignored "-Wdangling-pointer"
@@ -836,6 +833,9 @@ JL_DLLEXPORT void julia_init(JL_IMAGE_SEARCH rel)
836833
#pragma GCC diagnostic pop
837834
JL_GC_PROMISE_ROOTED(ct);
838835
_finish_julia_init(rel, ptls, ct);
836+
#ifdef MMTK_GC
837+
mmtk_initialize_collection((void *)ptls);
838+
#endif
839839
}
840840

841841
static NOINLINE void _finish_julia_init(JL_IMAGE_SEARCH rel, jl_ptls_t ptls, jl_task_t *ct)

0 commit comments

Comments
 (0)