mirror of
https://github.com/Ed94/Odin.git
synced 2026-06-13 01:21:38 -07:00
Handle missing procedures better
This commit is contained in:
+11
-5
@@ -12,7 +12,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef LLVM_WEAK_MONOMORPHIZATION
|
||||
#define LLVM_WEAK_MONOMORPHIZATION build_context.internal_weak_monomorphization
|
||||
#define LLVM_WEAK_MONOMORPHIZATION 1
|
||||
#endif
|
||||
|
||||
|
||||
@@ -2478,8 +2478,14 @@ gb_internal void lb_generate_procedures(lbGenerator *gen, bool do_threading) {
|
||||
gb_internal WORKER_TASK_PROC(lb_generate_missing_procedures_to_check_worker_proc) {
|
||||
lbModule *m = cast(lbModule *)data;
|
||||
for (lbProcedure *p = nullptr; mpsc_dequeue(&m->missing_procedures_to_check, &p); /**/) {
|
||||
debugf("Generate missing procedure: %.*s module %p\n", LIT(p->name), m);
|
||||
lb_generate_procedure(m, p);
|
||||
if (!p->is_done.load(std::memory_order_relaxed)) {
|
||||
debugf("Generate missing procedure: %.*s module %p\n", LIT(p->name), m);
|
||||
lb_generate_procedure(m, p);
|
||||
}
|
||||
|
||||
for (lbProcedure *nested = nullptr; mpsc_dequeue(&m->procedures_to_generate, &nested); /**/) {
|
||||
mpsc_enqueue(&m->missing_procedures_to_check, nested);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -2860,7 +2866,7 @@ gb_internal lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *star
|
||||
}
|
||||
|
||||
gb_internal void lb_generate_procedure(lbModule *m, lbProcedure *p) {
|
||||
if (p->is_done) {
|
||||
if (p->is_done.load(std::memory_order_relaxed)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2869,7 +2875,7 @@ gb_internal void lb_generate_procedure(lbModule *m, lbProcedure *p) {
|
||||
lb_begin_procedure_body(p);
|
||||
lb_build_stmt(p, p->body);
|
||||
lb_end_procedure_body(p);
|
||||
p->is_done = true;
|
||||
p->is_done.store(true, std::memory_order_relaxed);
|
||||
m->curr_procedure = nullptr;
|
||||
} else if (p->generate_body != nullptr) {
|
||||
p->generate_body(m, p);
|
||||
|
||||
@@ -366,9 +366,9 @@ struct lbProcedure {
|
||||
|
||||
lbFunctionType *abi_function_type;
|
||||
|
||||
LLVMValueRef value;
|
||||
LLVMBuilderRef builder;
|
||||
bool is_done;
|
||||
LLVMValueRef value;
|
||||
LLVMBuilderRef builder;
|
||||
std::atomic<bool> is_done;
|
||||
|
||||
lbAddr return_ptr;
|
||||
Array<lbDefer> defer_stmts;
|
||||
|
||||
@@ -3082,9 +3082,12 @@ gb_internal lbValue lb_find_procedure_value_from_entity(lbModule *m, Entity *e)
|
||||
if (found == nullptr) {
|
||||
// THIS IS THE RACE CONDITION
|
||||
lbProcedure *missing_proc_in_other_module = lb_create_procedure(other_module, e, false);
|
||||
mpsc_enqueue(&other_module->missing_procedures_to_check, missing_proc_in_other_module);
|
||||
if (!missing_proc_in_other_module->is_done.load(std::memory_order_relaxed)) {
|
||||
mpsc_enqueue(&other_module->missing_procedures_to_check, missing_proc_in_other_module);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
GB_PANIC("missing procedure: %.*s", LIT(missing_proc->name));
|
||||
mpsc_enqueue(&m->missing_procedures_to_check, missing_proc);
|
||||
}
|
||||
|
||||
@@ -3157,7 +3160,9 @@ gb_internal lbValue lb_generate_anonymous_proc_lit(lbModule *m, String const &pr
|
||||
rw_mutex_shared_unlock(&target_module->values_mutex);
|
||||
if (found == nullptr) {
|
||||
lbProcedure *missing_proc_in_target_module = lb_create_procedure(target_module, e, false);
|
||||
mpsc_enqueue(&target_module->missing_procedures_to_check, missing_proc_in_target_module);
|
||||
if (!missing_proc_in_target_module->is_done.load(std::memory_order_relaxed)) {
|
||||
mpsc_enqueue(&target_module->missing_procedures_to_check, missing_proc_in_target_module);
|
||||
}
|
||||
}
|
||||
|
||||
lbProcedure *p = lb_create_procedure(m, e, true);
|
||||
|
||||
@@ -99,7 +99,6 @@ gb_internal lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool i
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
lbProcedure *p = gb_alloc_item(permanent_allocator(), lbProcedure);
|
||||
|
||||
p->module = m;
|
||||
|
||||
Reference in New Issue
Block a user