Skip to content

Commit

Permalink
fix sysimage-native-code=yes option (#53407)
Browse files Browse the repository at this point in the history
Follow up to #53373, it seems this assert was broken for empty packages,
causing CI issues. It is not necessary.

Observed in CI here: #53395

https://buildkite.com/julialang/julia-master/builds/33860#018dc4dc-a603-4ad1-90cf-574540a41720
  • Loading branch information
vtjnash committed Feb 21, 2024
1 parent 61fc907 commit 3742d33
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/staticdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -3092,11 +3092,7 @@ static void jl_restore_system_image_from_stream_(ios_t *f, jl_image_t *image, jl

// 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 {
if (imaging_mode || jl_options.use_sysimage_native_code != JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES) {
memset(&image->fptrs, 0, sizeof(image->fptrs));
image->gvars_base = NULL;
}
Expand Down

0 comments on commit 3742d33

Please sign in to comment.