Cleanup #2

src/aotcompile.cpp

@@ -94,7 +94,6 @@ typedef struct {
     std::map<jl_code_instance_t*, std::tuple<uint32_t, uint32_t>> jl_fvar_map;
     std::vector<void*> jl_value_to_llvm;
     std::vector<jl_code_instance_t*> jl_external_to_llvm;
-    int32_t external_fns_begin;
 } jl_native_code_desc_t;
 
 extern "C" JL_DLLEXPORT

src/staticdata.c

@@ -1781,9 +1781,10 @@ static void jl_update_all_fptrs(jl_serializer_state *s)
     jl_register_fptrs(sysimage_base, &fvars, linfos, sysimg_fvars_max);
 }
 
-static void write_gvars(jl_serializer_state *s, arraylist_t *globals) JL_NOTSAFEPOINT
+static uint32_t write_gvars(jl_serializer_state *s, arraylist_t *globals, arraylist_t *external_fns) JL_NOTSAFEPOINT
 {
-    ios_ensureroom(s->gvar_record, globals->len * sizeof(reloc_t));
+    size_t len = globals->len + external_fns->leng
+    ios_ensureroom(s->gvar_record, len * sizeof(reloc_t));
     for (size_t i = 0; i < globals->len; i++) {
         void *g = globals->items[i];
         void *b = ptrhash_get(&bindings, g);
@@ -1796,10 +1797,17 @@ static void write_gvars(jl_serializer_state *s, arraylist_t *globals) JL_NOTSAFE
         uintptr_t reloc = get_reloc_for_item(item, 0);
         write_reloc_t(s->gvar_record, reloc);
     }
+    for (size_t i = 0; i < external_fns->len; i++) {
+        jl_codeinstance_t *ci = external_fns->items[i];
+        uintptr_t item = backref_id(s, (void*)ci, s->link_ids_external_fnvars);
+        uintptr_t reloc = get_reloc_for_item(item, 0);
+        write_reloc_t(s->gvar_record, reloc);
+    }
+    return globals->len + 1;
 }
 
 // Pointer relocation for native-code referenced global variables
-static void jl_update_all_gvars(jl_serializer_state *s, int32_t external_fns_begin)
+static void jl_update_all_gvars(jl_serializer_state *s, uint32_t external_fns_begin)
 {
     if (sysimg_gvars_base == NULL)
         return;
@@ -1820,10 +1828,9 @@ static void jl_update_all_gvars(jl_serializer_state *s, int32_t external_fns_beg
             }
             else {
                 uintptr_t v = get_item_for_reloc(s, base, size, offset, s->link_ids_external_fnvars, &external_fns_link_index);
-                jl_breakpoint((jl_value_t*)v);
                 jl_code_instance_t *codeinst = (jl_code_instance_t*) v;
-                // TODO: use side-table to decide if call location is specsig or not instead of assuming
-                *sysimg_gvars(sysimg_gvars_base, gvname_index) = codeinst->isspecsig ? codeinst->specptr.fptr : codeinst->invoke;
+                assert(codeinst->isspecsig);
+                *sysimg_gvars(sysimg_gvars_base, gvname_index) = codeinst->specptr.fptr;
             }
         }
         gvname_index += 1;
@@ -2315,12 +2322,12 @@ static void jl_save_system_image_to_stream(ios_t *f,
         }
     }
 
+    uint32_t external_fns_begin = 0;
     { // step 2: build all the sysimg sections
         write_padding(&sysimg, sizeof(uintptr_t));
         jl_write_values(&s);
         jl_write_relocations(&s);
-        write_gvars(&s, &gvars);
-        // TODO write external_fns;
+        external_fns_begin = write_gvars(&s, &gvars, &external_fns);
     }
 
     if (sysimg.size > ((uintptr_t)1 << RELOC_TAG_OFFSET)) {
@@ -2421,9 +2428,7 @@ static void jl_save_system_image_to_stream(ios_t *f,
         ios_write(f, (char*)jl_array_data(s.link_ids_gvars), jl_array_len(s.link_ids_gvars)*sizeof(uint64_t));
         write_uint32(f, jl_array_len(s.link_ids_external_fnvars));
         ios_write(f, (char*)jl_array_data(s.link_ids_external_fnvars), jl_array_len(s.link_ids_external_fnvars)*sizeof(uint64_t));
-        // write the gvar boundary between global variables and external functions
-        write_int32(f, jl_get_llvm_external_fns_begin(native_functions));
-
+        write_uint32(f, external_fns_begin);
         jl_write_arraylist(s.s, &s.ccallable_list);
     }
     // Write the build_id key
@@ -2441,6 +2446,7 @@ static void jl_save_system_image_to_stream(ios_t *f,
     arraylist_free(&s.relocs_list);
     arraylist_free(&s.gctags_list);
     arraylist_free(&gvars);
+    arraylist_free(&external_fns);
     htable_free(&field_replace);
     if (worklist)
         htable_free(&external_objects);