Skip to content

Call initialize_collection after _finish_julia_init #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Call initialize_collection after _finish_julia_init #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,9 +824,6 @@ JL_DLLEXPORT void julia_init(JL_IMAGE_SEARCH rel)

jl_ptls_t ptls = jl_init_threadtls(0);

#ifdef MMTK_GC
mmtk_initialize_collection((void *)ptls);
#endif
#pragma GCC diagnostic push
#if defined(_COMPILER_GCC_) && __GNUC__ >= 12
#pragma GCC diagnostic ignored "-Wdangling-pointer"
Expand All @@ -836,6 +833,9 @@ JL_DLLEXPORT void julia_init(JL_IMAGE_SEARCH rel)
#pragma GCC diagnostic pop
JL_GC_PROMISE_ROOTED(ct);
_finish_julia_init(rel, ptls, ct);
#ifdef MMTK_GC
mmtk_initialize_collection((void *)ptls);
#endif
}

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