ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Distribute anonymous procedure literals correctly across LLVM modules

Browse Source
This commit is contained in:
gingerBill
2025-09-19 11:13:18 +01:00
parent 6ce889f4eb
commit 1a4da5cb0f
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend_general.cpp
+36 -12
View File
@@ -3083,7 +3083,7 @@ gb_internal lbValue lb_find_procedure_value_from_entity(lbModule *m, Entity *e)
gb_internal lbValue lb_generate_anonymous_proc_lit(lbModule *m, String const &prefix_name, Ast *expr, lbProcedure *parent) { gb_internal lbValue lb_generate_anonymous_proc_lit(lbModule *m, String const &prefix_name, Ast *expr, lbProcedure *parent) {
// lbGenerator *gen = m->gen; lbGenerator *gen = m->gen;
ast_node(pl, ProcLit, expr); ast_node(pl, ProcLit, expr);
if (pl->decl->entity.load() != nullptr) { if (pl->decl->entity.load() != nullptr) {
@@ -3112,8 +3112,11 @@ gb_internal lbValue lb_generate_anonymous_proc_lit(lbModule *m, String const &pr
e->pkg = e->file->pkg; e->pkg = e->file->pkg;
e->scope = e->file->scope; e->scope = e->file->scope;
lbModule *target_module = lb_module_of_entity(gen, e, m);
GB_ASSERT(target_module != nullptr);
// NOTE(bill): this is to prevent a race condition since these procedure literals can be created anywhere at any time // NOTE(bill): this is to prevent a race condition since these procedure literals can be created anywhere at any time
pl->decl->code_gen_module = m; pl->decl->code_gen_module = target_module;
e->decl_info = pl->decl; e->decl_info = pl->decl;
e->parent_proc_decl = pl->decl->parent; e->parent_proc_decl = pl->decl->parent;
e->Procedure.is_anonymous = true; e->Procedure.is_anonymous = true;
@@ -3121,20 +3124,41 @@ gb_internal lbValue lb_generate_anonymous_proc_lit(lbModule *m, String const &pr
pl->decl->entity.store(e); pl->decl->entity.store(e);
lbProcedure *p = lb_create_procedure(m, e);
GB_ASSERT(e->code_gen_module == m);
lbValue value = {}; if (target_module != m) {
value.value = p->value; mutex_lock(&target_module->missing_procedures_to_check_mutex);
value.type = p->type; rw_mutex_shared_lock(&target_module->values_mutex);
lbValue *found = map_get(&target_module->values, e);
rw_mutex_shared_unlock(&target_module->values_mutex);
if (found == nullptr) {
// THIS IS THE RACE CONDITION
lbProcedure *missing_proc_in_target_module = lb_create_procedure(target_module, e, false);
array_add(&target_module->missing_procedures_to_check, missing_proc_in_target_module);
}
array_add(&m->procedures_to_generate, p); mutex_unlock(&target_module->missing_procedures_to_check_mutex);
if (parent != nullptr) {
array_add(&parent->children, p); lbProcedure *p = lb_create_procedure(m, e, true);
lbValue value = {};
value.value = p->value;
value.type = p->type;
return value;
} else { } else {
string_map_set(&m->members, name, value); lbProcedure *p = lb_create_procedure(m, e);
lbValue value = {};
value.value = p->value;
value.type = p->type;
array_add(&m->procedures_to_generate, p);
if (parent != nullptr) {
array_add(&parent->children, p);
} else {
string_map_set(&m->members, name, value);
}
return value;
} }
return value;
} }