Skip to content

Commit 88aa27f

Browse files
authored
strip Module filename from metadata (#57499)
Fix #57358
1 parent d794780 commit 88aa27f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/staticdata.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,8 @@ static void jl_queue_module_for_serialization(jl_serializer_state *s, jl_module_
794794
{
795795
jl_queue_for_serialization(s, m->name);
796796
jl_queue_for_serialization(s, m->parent);
797+
if (jl_options.strip_metadata)
798+
jl_queue_for_serialization(s, m->file);
797799
if (jl_options.trim) {
798800
jl_queue_for_serialization_(s, (jl_value_t*)jl_atomic_load_relaxed(&m->bindings), 0, 1);
799801
} else {
@@ -1339,7 +1341,9 @@ static void jl_write_module(jl_serializer_state *s, uintptr_t item, jl_module_t
13391341
arraylist_push(&s->relocs_list, (void*)backref_id(s, jl_atomic_load_relaxed(&m->bindingkeyset), s->link_ids_relocs));
13401342
newm->file = NULL;
13411343
arraylist_push(&s->relocs_list, (void*)(reloc_offset + offsetof(jl_module_t, file)));
1342-
arraylist_push(&s->relocs_list, (void*)backref_id(s, m->file, s->link_ids_relocs));
1344+
arraylist_push(&s->relocs_list, (void*)backref_id(s, jl_options.strip_metadata ? jl_empty_sym : m->file , s->link_ids_relocs));
1345+
if (jl_options.strip_metadata)
1346+
newm->line = 0;
13431347
newm->usings_backedges = NULL;
13441348
arraylist_push(&s->relocs_list, (void*)(reloc_offset + offsetof(jl_module_t, usings_backedges)));
13451349
arraylist_push(&s->relocs_list, (void*)backref_id(s, m->usings_backedges, s->link_ids_relocs));
@@ -2593,7 +2597,7 @@ uint_t bindingkey_hash(size_t idx, jl_value_t *data);
25932597

25942598
static void jl_prune_module_bindings(jl_module_t * m) JL_GC_DISABLED
25952599
{
2596-
jl_svec_t * bindings = jl_atomic_load_relaxed(&m->bindings);
2600+
jl_svec_t *bindings = jl_atomic_load_relaxed(&m->bindings);
25972601
size_t l = jl_svec_len(bindings), i;
25982602
arraylist_t bindings_list;
25992603
arraylist_new(&bindings_list, 0);

0 commit comments

Comments
 (0)