Revert "Refactor initialization slightly in cases where we have a handle"

This reverts commit cffc508.

Author: gbaraldi

src/init.c

@@ -383,7 +383,6 @@ JL_DLLEXPORT void *jl_libjulia_internal_handle;
 JL_DLLEXPORT void *jl_libjulia_handle;
 JL_DLLEXPORT void *jl_RTLD_DEFAULT_handle;
 JL_DLLEXPORT void *jl_exe_handle;
-JL_DLLEXPORT void *jl_image_handle = NULL;
 #ifdef _OS_WINDOWS_
 void *jl_ntdll_handle;
 void *jl_kernel32_handle;
@@ -873,12 +872,11 @@ static NOINLINE void _finish_julia_init(JL_IMAGE_SEARCH rel, jl_ptls_t ptls, jl_
 
     // loads sysimg if available, and conditionally sets jl_options.cpu_target
     jl_image_buf_t sysimage = { JL_IMAGE_KIND_NONE };
-    if (jl_image_handle) {
-        sysimage = jl_set_sysimg_so(jl_image_handle);
-    } else if (rel == JL_IMAGE_IN_MEMORY) {
+    if (rel == JL_IMAGE_IN_MEMORY) {
         sysimage = jl_set_sysimg_so(jl_exe_handle);
         jl_options.image_file = jl_options.julia_bin;
-    } else if (jl_options.image_file)
+    }
+    else if (jl_options.image_file)
         sysimage = jl_preload_sysimg(jl_options.image_file);
 
     if (sysimage.kind == JL_IMAGE_KIND_SO)

src/julia_internal.h

@@ -1592,7 +1592,6 @@ JL_DLLEXPORT uint64_t jl_rand(void) JL_NOTSAFEPOINT;
 JL_DLLEXPORT void jl_srand(uint64_t) JL_NOTSAFEPOINT;
 JL_DLLEXPORT void jl_init_rand(void);
 
-JL_DLLEXPORT extern void *jl_image_handle;
 JL_DLLEXPORT extern void *jl_exe_handle;
 JL_DLLEXPORT extern void *jl_libjulia_handle;
 JL_DLLEXPORT extern void *jl_libjulia_internal_handle;

src/staticdata.c

@@ -3736,9 +3736,8 @@ JL_DLLEXPORT jl_image_buf_t jl_set_sysimg_so(void *handle)
 {
     if (jl_sysimage_buf.kind != JL_IMAGE_KIND_NONE)
         return jl_sysimage_buf;
+
     jl_sysimage_buf = get_image_buf(handle, /* is_pkgimage */ 0);
-    if (jl_image_handle == NULL)
-        jl_image_handle = handle;
     return jl_sysimage_buf;
 }
 

src/threading.c

@@ -456,7 +456,6 @@ JL_DLLEXPORT jl_gcframe_t **jl_autoinit_and_adopt_thread(void)
     if (!jl_is_initialized()) {
         void *retaddr = __builtin_extract_return_addr(__builtin_return_address(0));
         void *handle = jl_find_dynamic_library_by_addr(retaddr, 0);
-        jl_image_handle = handle;
         if (handle == NULL) {
             fprintf(stderr, "error: runtime auto-initialization failed due to bad sysimage lookup\n"
                             "       (this should not happen, please file a bug report)\n");