@@ -3385,7 +3385,7 @@ static jl_value_t *jl_validate_cache_file(ios_t *f, jl_array_t *depmods, uint64_
33853385}
33863386
33873387// TODO?: refactor to make it easier to create the "package inspector"
3388- static jl_value_t * jl_restore_package_image_from_stream (void * pkgimage_handle , ios_t * f , jl_image_t * image , jl_array_t * depmods , int completeinfo , const char * pkgname , bool needs_permalloc )
3388+ static jl_value_t * jl_restore_package_image_from_stream (ios_t * f , jl_image_t * image , jl_array_t * depmods , int completeinfo , const char * pkgname , bool needs_permalloc )
33893389{
33903390 JL_TIMING (LOAD_IMAGE , LOAD_Pkgimg );
33913391 jl_timing_printf (JL_TIMING_DEFAULT_BLOCK , pkgname );
@@ -3440,7 +3440,7 @@ static jl_value_t *jl_restore_package_image_from_stream(void* pkgimage_handle, i
34403440 size_t world = jl_atomic_load_acquire (& jl_world_counter );
34413441 jl_insert_backedges ((jl_array_t * )edges , (jl_array_t * )ext_targets , (jl_array_t * )new_specializations , world ); // restore external backedges (needs to be last)
34423442 // reinit ccallables
3443- jl_reinit_ccallable (& ccallable_list , base , pkgimage_handle );
3443+ jl_reinit_ccallable (& ccallable_list , base , NULL );
34443444 arraylist_free (& ccallable_list );
34453445
34463446 if (completeinfo ) {
@@ -3471,11 +3471,11 @@ static void jl_restore_system_image_from_stream(ios_t *f, jl_image_t *image, uin
34713471 jl_restore_system_image_from_stream_ (f , image , NULL , checksum | ((uint64_t )0xfdfcfbfa << 32 ), NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL );
34723472}
34733473
3474- JL_DLLEXPORT jl_value_t * jl_restore_incremental_from_buf (void * pkgimage_handle , const char * buf , jl_image_t * image , size_t sz , jl_array_t * depmods , int completeinfo , const char * pkgname , bool needs_permalloc )
3474+ JL_DLLEXPORT jl_value_t * jl_restore_incremental_from_buf (const char * buf , jl_image_t * image , size_t sz , jl_array_t * depmods , int completeinfo , const char * pkgname , bool needs_permalloc )
34753475{
34763476 ios_t f ;
34773477 ios_static_buffer (& f , (char * )buf , sz );
3478- jl_value_t * ret = jl_restore_package_image_from_stream (pkgimage_handle , & f , image , depmods , completeinfo , pkgname , needs_permalloc );
3478+ jl_value_t * ret = jl_restore_package_image_from_stream (& f , image , depmods , completeinfo , pkgname , needs_permalloc );
34793479 ios_close (& f );
34803480 return ret ;
34813481}
@@ -3488,7 +3488,7 @@ JL_DLLEXPORT jl_value_t *jl_restore_incremental(const char *fname, jl_array_t *d
34883488 "Cache file \"%s\" not found.\n" , fname );
34893489 }
34903490 jl_image_t pkgimage = {};
3491- jl_value_t * ret = jl_restore_package_image_from_stream (NULL , & f , & pkgimage , depmods , completeinfo , pkgname , true);
3491+ jl_value_t * ret = jl_restore_package_image_from_stream (& f , & pkgimage , depmods , completeinfo , pkgname , true);
34923492 ios_close (& f );
34933493 return ret ;
34943494}
@@ -3559,7 +3559,7 @@ JL_DLLEXPORT jl_value_t *jl_restore_package_image_from_file(const char *fname, j
35593559
35603560 jl_image_t pkgimage = jl_init_processor_pkgimg (pkgimg_handle );
35613561
3562- jl_value_t * mod = jl_restore_incremental_from_buf (pkgimg_handle , pkgimg_data , & pkgimage , * plen , depmods , completeinfo , pkgname , false);
3562+ jl_value_t * mod = jl_restore_incremental_from_buf (pkgimg_data , & pkgimage , * plen , depmods , completeinfo , pkgname , false);
35633563
35643564 return mod ;
35653565}
0 commit comments