mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-18 20:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use more deterministic module names

Browse Source
This commit is contained in:
gingerBill
2025-02-25 14:35:54 +00:00
parent f9d85a7311
commit 5aafbc7f30
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/llvm_backend.hpp
View File

@@ -182,8 +182,6 @@ struct lbModule {
StringMap<lbProcedure *> gen_procs; // key is the canonicalized name
std::atomic<u32> nested_type_name_guid;
Array<lbProcedure *> procedures_to_generate;
Array<Entity *> global_procedures_to_create;
Array<Entity *> global_types_to_create;
@@ -229,7 +227,6 @@ struct lbGenerator : LinkerData {
PtrMap<Ast *, lbProcedure *> anonymous_proc_lits;
std::atomic<u32> global_array_index;
std::atomic<u32> global_generated_index;
isize used_module_count;

11
src/llvm_backend_general.cpp
View File

@@ -20,7 +20,13 @@ gb_internal void lb_init_module(lbModule *m, Checker *c) {
gbString module_name = gb_string_make(heap_allocator(), "odin_package");
if (m->file) {
module_name = gb_string_append_fmt(module_name, "-%u", m->file->id+1);
if (m->pkg) {
module_name = gb_string_appendc(module_name, "-");
module_name = gb_string_append_length(module_name, m->pkg->name.text, m->pkg->name.len);
}
module_name = gb_string_appendc(module_name, "-");
String filename = filename_from_path(m->file->filename);
module_name = gb_string_append_length(module_name, filename.text, filename.len);
} else if (m->pkg) {
module_name = gb_string_appendc(module_name, "-");
module_name = gb_string_append_length(module_name, m->pkg->name.text, m->pkg->name.len);
@@ -2814,10 +2820,11 @@ gb_internal lbAddr lb_add_global_generated_from_procedure(lbProcedure *p, Type *
u32 index = ++p->global_generated_index;
gbString s = gb_string_make(temporary_allocator(), "ggv$");
s = gb_string_appendc(s, p->module->module_name);
s = gb_string_appendc(s, "$");
s = gb_string_append_length(s, p->name.text, p->name.len);
s = gb_string_append_fmt(s, "$%u", index);
String name = make_string(cast(u8 const *)s, gb_string_length(s));
return lb_add_global_generated_with_name(p->module, type, value, name);
}