Skip to content

Commit 64d5166

Browse files
authored
Revert "staticdata: fix assert from partially disabled native code (#53439)"
This reverts commit 6cbed31.
1 parent 138aba7 commit 64d5166

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/staticdata.c

+2-5
Original file line numberDiff line numberDiff line change
@@ -3768,11 +3768,8 @@ JL_DLLEXPORT jl_value_t *jl_restore_package_image_from_file(const char *fname, j
37683768

37693769
jl_image_t pkgimage = jl_init_processor_pkgimg(pkgimg_handle);
37703770

3771-
if (ignore_native) {
3772-
// Must disable using native code in possible downstream users of this code:
3773-
// https://github.com/JuliaLang/julia/pull/52123#issuecomment-1959965395.
3774-
// The easiest way to do that is to disable it in all of them.
3775-
jl_options.use_sysimage_native_code = JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_NO;
3771+
if (ignore_native){
3772+
memset(&pkgimage.fptrs, 0, sizeof(pkgimage.fptrs));
37763773
}
37773774

37783775
jl_value_t* mod = jl_restore_incremental_from_buf(pkgimg_handle, pkgimg_data, &pkgimage, *plen, depmods, completeinfo, pkgname, 0);

0 commit comments

Comments
 (0)