Only add symbols that are explicit entrypoints when building juliac image

src/precompile_utils.c

@@ -374,9 +374,8 @@ static void *jl_precompile_trimmed(size_t world)
     jl_value_t *ccallable = NULL;
     JL_GC_PUSH2(&m, &ccallable);
     jl_method_instance_t *mi;
-    while (1)
-    {
-        mi = (jl_method_instance_t*)arraylist_pop(jl_entrypoint_mis);
+    for (size_t i = 0; i < jl_entrypoint_mis->len ; i++) {
+        mi = (jl_method_instance_t*)jl_entrypoint_mis->items[i];
         if (mi == NULL)
             break;
         assert(jl_is_method_instance(mi));
@@ -386,7 +385,6 @@ static void *jl_precompile_trimmed(size_t world)
         if (ccallable)
             jl_array_ptr_1d_push(m, ccallable);
     }
-
     jl_cgparams_t params = jl_default_cgparams;
     params.trim = jl_options.trim;
     void *native_code = jl_create_native(m, NULL, &params, 0, /* imaging */ 1, 0,

src/staticdata.c

@@ -1741,8 +1741,20 @@ static void jl_write_values(jl_serializer_state *s) JL_GC_DISABLED
                 else {
                     newm->nroots_sysimg = m->roots ? jl_array_len(m->roots) : 0;
                 }
-                if (m->ccallable)
-                    arraylist_push(&s->ccallable_list, (void*)reloc_offset);
+                if (m->ccallable) {
+                    int should_push = !jl_options.trim;
+                    for (size_t i = 0; !should_push && i < jl_entrypoint_mis->len  ; i++) {
+                        jl_method_instance_t* mi = (jl_method_instance_t*)jl_entrypoint_mis->items[i];
+                        assert(jl_is_method_instance(mi));
+                        jl_method_t *ccallable = mi->def.method;
+                        if (ccallable == m) {
+                            should_push = 1;
+                            break;
+                        }
+                    }
+                    if (should_push)
+                        arraylist_push(&s->ccallable_list, (void*)reloc_offset);
+                }
             }
             else if (jl_is_method_instance(v)) {
                 assert(f == s->s);