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

Fix race condition with -use-separate-modules due to type determination

Browse Source
This commit is contained in:
gingerBill
2023-04-18 17:20:50 +01:00
parent 30fa8f8ac2
commit 843eaf8893
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend.hpp
+5 -3
View File
@@ -139,9 +139,11 @@ struct lbModule {
AstPackage *pkg; // possibly associated AstPackage *pkg; // possibly associated
AstFile *file; // possibly associated AstFile *file; // possibly associated
PtrMap<Type *, LLVMTypeRef> types; PtrMap<Type *, LLVMTypeRef> types; // mutex: types_mutex
PtrMap<Type *, LLVMTypeRef> func_raw_types; PtrMap<void *, lbStructFieldRemapping> struct_field_remapping; // Key: LLVMTypeRef or Type *, mutex: types_mutex
PtrMap<void *, lbStructFieldRemapping> struct_field_remapping; // Key: LLVMTypeRef or Type * PtrMap<Type *, LLVMTypeRef> func_raw_types; // mutex: func_raw_types_mutex
RecursiveMutex types_mutex;
RecursiveMutex func_raw_types_mutex;
i32 internal_type_level; i32 internal_type_level;
RwMutex values_mutex; RwMutex values_mutex;
src/llvm_backend_general.cpp
+6
View File
@@ -1498,6 +1498,9 @@ gb_internal LLVMTypeRef lb_type_internal_for_procedures_raw(lbModule *m, Type *t
type = base_type(original_type); type = base_type(original_type);
GB_ASSERT(type->kind == Type_Proc); GB_ASSERT(type->kind == Type_Proc);
mutex_lock(&m->func_raw_types_mutex);
defer (mutex_unlock(&m->func_raw_types_mutex));
LLVMTypeRef *found = map_get(&m->func_raw_types, type); LLVMTypeRef *found = map_get(&m->func_raw_types, type);
if (found) { if (found) {
return *found; return *found;
@@ -2157,6 +2160,9 @@ gb_internal LLVMTypeRef lb_type_internal(lbModule *m, Type *type) {
gb_internal LLVMTypeRef lb_type(lbModule *m, Type *type) { gb_internal LLVMTypeRef lb_type(lbModule *m, Type *type) {
type = default_type(type); type = default_type(type);
mutex_lock(&m->types_mutex);
defer (mutex_unlock(&m->types_mutex));
LLVMTypeRef *found = map_get(&m->types, type); LLVMTypeRef *found = map_get(&m->types, type);
if (found) { if (found) {
return *found; return *found;
src/llvm_backend_utility.cpp
+7
View File
@@ -910,11 +910,18 @@ gb_internal lbValue lb_address_from_load_if_readonly_parameter(lbProcedure *p, l
gb_internal lbStructFieldRemapping lb_get_struct_remapping(lbModule *m, Type *t) { gb_internal lbStructFieldRemapping lb_get_struct_remapping(lbModule *m, Type *t) {
t = base_type(t); t = base_type(t);
LLVMTypeRef struct_type = lb_type(m, t); LLVMTypeRef struct_type = lb_type(m, t);
mutex_lock(&m->types_mutex);
auto *field_remapping = map_get(&m->struct_field_remapping, cast(void *)struct_type); auto *field_remapping = map_get(&m->struct_field_remapping, cast(void *)struct_type);
if (field_remapping == nullptr) { if (field_remapping == nullptr) {
field_remapping = map_get(&m->struct_field_remapping, cast(void *)t); field_remapping = map_get(&m->struct_field_remapping, cast(void *)t);
} }
mutex_unlock(&m->types_mutex);
GB_ASSERT_MSG(field_remapping != nullptr, "%s", type_to_string(t)); GB_ASSERT_MSG(field_remapping != nullptr, "%s", type_to_string(t));
return *field_remapping; return *field_remapping;
} }