From 843eaf8893e3a7df9645c0bcba86c71a01a14765 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 18 Apr 2023 17:20:50 +0100 Subject: Fix race condition with -use-separate-modules due to type determination --- src/llvm_backend_utility.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/llvm_backend_utility.cpp') diff --git a/src/llvm_backend_utility.cpp b/src/llvm_backend_utility.cpp index 19df9ab06..ddae2243b 100644 --- a/src/llvm_backend_utility.cpp +++ b/src/llvm_backend_utility.cpp @@ -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) { t = base_type(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); if (field_remapping == nullptr) { 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)); return *field_remapping; } -- cgit v1.2.3