mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-12 06:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6217 from odin-lang/bill/threading-fixes-2026-02

Browse Source 
Fix to frontend threading bugs
This commit is contained in:
gingerBill
2026-02-02 12:04:21 +00:00
committed by GitHub
parent 813b622dcc a936f3fb7d
commit 80c9482774
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/checker.cpp
View File

@@ -495,15 +495,18 @@ gb_internal Entity *scope_insert_with_name(Scope *s, String const &name, Entity
goto end;
}
if (s->parent != nullptr && (s->parent->flags & ScopeFlag_Proc) != 0) {
rw_mutex_shared_lock(&s->parent->mutex);
found = string_map_get(&s->parent->elements, key);
if (found) {
if ((*found)->flags & EntityFlag_Result) {
if (entity != *found) {
result = *found;
}
rw_mutex_shared_unlock(&s->parent->mutex);
goto end;
}
}
rw_mutex_shared_unlock(&s->parent->mutex);
}
string_map_set(&s->elements, key, entity);

5
src/exact_value.cpp
View File

@@ -1,8 +1,6 @@
#include <math.h>
#include <stdlib.h>
gb_global BlockingMutex hash_exact_value_mutex;
struct Ast;
struct HashKey;
struct Type;
@@ -54,9 +52,6 @@ struct ExactValue {
gb_global ExactValue const empty_exact_value = {};
gb_internal uintptr hash_exact_value(ExactValue v) {
mutex_lock(&hash_exact_value_mutex);
defer (mutex_unlock(&hash_exact_value_mutex));
uintptr res = 0;
switch (v.kind) {

10
src/types.cpp
View File

@@ -4308,17 +4308,17 @@ gb_internal i64 *type_set_offsets_of(Slice<Entity *> const &fields, bool is_pack
gb_internal bool type_set_offsets(Type *t) {
t = base_type(t);
if (t->kind == Type_Struct) {
if (t->Struct.are_offsets_being_processed.load()) {
return true;
}
// if (t->Struct.are_offsets_being_processed.load()) {
// return true;
// }
MUTEX_GUARD(&t->Struct.offset_mutex);
if (!t->Struct.are_offsets_set) {
t->Struct.are_offsets_being_processed.store(true);
t->Struct.offsets = type_set_offsets_of(t->Struct.fields, t->Struct.is_packed, t->Struct.is_raw_union, t->Struct.custom_min_field_align, t->Struct.custom_max_field_align);
t->Struct.are_offsets_being_processed.store(false);
t->Struct.are_offsets_set = true;
return true;
}
return true;
} else if (is_type_tuple(t)) {
MUTEX_GUARD(&t->Tuple.mutex);
if (!t->Tuple.are_offsets_set) {
@@ -4326,8 +4326,8 @@ gb_internal bool type_set_offsets(Type *t) {
t->Tuple.offsets = type_set_offsets_of(t->Tuple.variables, t->Tuple.is_packed, false, 1, 0);
t->Tuple.are_offsets_being_processed.store(false);
t->Tuple.are_offsets_set = true;
return true;
}
return true;
} else {
GB_PANIC("Invalid type for setting offsets");
}