Skip to content

Commit

Permalink
fix sysimage-native-code=no option with pkgimages
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
  • Loading branch information
vtjnash committed Feb 17, 2024
1 parent ddd7afb commit af18a6d
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/staticdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -607,14 +607,6 @@ 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;
if (jl_sysimg_handle == jl_exe_handle &&
&jl_system_image_data != JL_WEAK_SYMBOL_DEFAULT(system_image_data_unavailable))
Expand Down Expand Up @@ -3097,6 +3089,15 @@ 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) {
assert(image->fptrs.ptrs);
}
else {
memset(&image->fptrs, 0, sizeof(image->fptrs));
}

// 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 af18a6d

Please sign in to comment.