Skip to content

Commit

Permalink
fix sysimage-native-code=no option with pkgimages (#53373)
Browse files Browse the repository at this point in the history
Loading pkgimages would try to access the sysimage native code, which
will fail. Ensure that no code tries to load if the sysimage native code
is not available, as it may try to link against it.

Fixes #53147

(cherry picked from commit 02699bb)
  • Loading branch information
vtjnash authored and KristofferC committed Feb 26, 2024
1 parent 43dc98a commit d5dcb94
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions src/staticdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -607,15 +607,8 @@ extern void * JL_WEAK_SYMBOL_OR_ALIAS_DEFAULT(system_image_data_unavailable) jl_
extern void * JL_WEAK_SYMBOL_OR_ALIAS_DEFAULT(system_image_data_unavailable) jl_system_image_size;
static void jl_load_sysimg_so(void)
{
int imaging_mode = jl_generating_output() && !jl_options.incremental;
// in --build mode only use sysimg data, not precompiled native code
if (!imaging_mode && jl_options.use_sysimage_native_code==JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES) {
assert(sysimage.fptrs.ptrs);
}
else {
memset(&sysimage.fptrs, 0, sizeof(sysimage.fptrs));
}
const char *sysimg_data;
assert(sysimage.fptrs.ptrs); // jl_init_processor_sysimg should already be run
if (jl_sysimg_handle == jl_exe_handle &&
&jl_system_image_data != JL_WEAK_SYMBOL_DEFAULT(system_image_data_unavailable))
sysimg_data = (const char*)&jl_system_image_data;
Expand Down Expand Up @@ -3097,6 +3090,17 @@ static void jl_restore_system_image_from_stream_(ios_t *f, jl_image_t *image, jl
htable_new(&new_dt_objs, 0);
arraylist_new(&deser_sym, 0);

// in --build mode only use sysimg data, not precompiled native code
int imaging_mode = jl_generating_output() && !jl_options.incremental;
if (!imaging_mode && jl_options.use_sysimage_native_code == JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES) {
if (image->gvars_base)
assert(image->fptrs.ptrs);
}
else {
memset(&image->fptrs, 0, sizeof(image->fptrs));
image->gvars_base = NULL;
}

// step 1: read section map
assert(ios_pos(f) == 0 && f->bm == bm_mem);
size_t sizeof_sysdata = read_uint(f);
Expand Down

0 comments on commit d5dcb94

Please sign in to comment.