Skip to content

ircode: handle content outside of a module #58639

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
Jun 5, 2025
Merged

ircode: handle content outside of a module #58639

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion src/precompile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ JL_DLLEXPORT void jl_write_compiler_output(void)
}
}

assert(jl_precompile_toplevel_module == NULL);
void *native_code = NULL;

bool_t emit_native = jl_options.outputo || jl_options.outputbc || jl_options.outputunoptbc || jl_options.outputasm;
Expand Down
6 changes: 0 additions & 6 deletions src/staticdata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3419,9 +3419,6 @@ static void jl_save_system_image_to_stream(ios_t *f, jl_array_t *mod_array,

static void jl_write_header_for_incremental(ios_t *f, jl_array_t *worklist, jl_array_t *mod_array, jl_array_t **udeps, int64_t *srctextpos, int64_t *checksumpos)
{
assert(jl_precompile_toplevel_module == NULL);
jl_precompile_toplevel_module = (jl_module_t*)jl_array_ptr_ref(worklist, jl_array_len(worklist)-1);

*checksumpos = write_header(f, 0);
write_uint8(f, jl_cache_flags());
// write description of contents (name, uuid, buildid)
Expand Down Expand Up @@ -3479,9 +3476,7 @@ JL_DLLEXPORT void jl_create_system_image(void **_native_data, jl_array_t *workli
// Generate _native_data`
if (_native_data != NULL) {
jl_prepare_serialization_data(mod_array, newly_inferred, &extext_methods, &new_ext_cis, NULL, &query_cache);
jl_precompile_toplevel_module = (jl_module_t*)jl_array_ptr_ref(worklist, jl_array_len(worklist)-1);
*_native_data = jl_precompile_worklist(worklist, extext_methods, new_ext_cis);
jl_precompile_toplevel_module = NULL;
extext_methods = NULL;
new_ext_cis = NULL;
}
Expand Down Expand Up @@ -3528,7 +3523,6 @@ JL_DLLEXPORT void jl_create_system_image(void **_native_data, jl_array_t *workli
// Re-enable running julia code for postoutput hooks, atexit, etc.
jl_gc_enable_finalizers(ct, 1);
ct->reentrant_timing &= ~0b1000u;
jl_precompile_toplevel_module = NULL;

if (worklist) {
// Go back and update the checksum in the header
Expand Down
7 changes: 2 additions & 5 deletions src/toplevel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ htable_t jl_current_modules;
jl_mutex_t jl_modules_mutex;

// During incremental compilation, the following gets set
jl_module_t *jl_precompile_toplevel_module = NULL; // the toplevel module currently being defined
jl_module_t *jl_precompile_toplevel_module = NULL; // the first toplevel module being defined

jl_module_t *jl_add_standard_imports(jl_module_t *m)
{
Expand Down Expand Up @@ -172,7 +172,6 @@ static jl_value_t *jl_eval_module_expr(jl_module_t *parent_module, jl_expr_t *ex
}
}

jl_module_t *old_toplevel_module = jl_precompile_toplevel_module;
size_t last_age = ct->world_age;

if (parent_module == jl_main_module && name == jl_symbol("Base") && jl_base_module == NULL) {
Expand All @@ -182,7 +181,7 @@ static jl_value_t *jl_eval_module_expr(jl_module_t *parent_module, jl_expr_t *ex

if (is_parent__toplevel__) {
jl_register_root_module(newm);
if (jl_options.incremental) {
if (jl_options.incremental && jl_precompile_toplevel_module == NULL) {
jl_precompile_toplevel_module = newm;
}
}
Expand Down Expand Up @@ -241,8 +240,6 @@ static jl_value_t *jl_eval_module_expr(jl_module_t *parent_module, jl_expr_t *ex
}
}

jl_precompile_toplevel_module = old_toplevel_module;

JL_GC_POP();
return (jl_value_t*)newm;
}
Expand Down