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

Add mutex for add_type_and_value

Browse Source
This commit is contained in:
gingerBill
2021-08-17 19:54:09 +01:00
parent 9ab94650c8
commit cdb3a5205c
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/checker.cpp
+15 -15
View File
@@ -870,6 +870,7 @@ void init_checker_info(CheckerInfo *i) {
mutex_init(&i->global_untyped_mutex); mutex_init(&i->global_untyped_mutex);
mutex_init(&i->type_info_mutex); mutex_init(&i->type_info_mutex);
mutex_init(&i->deps_mutex); mutex_init(&i->deps_mutex);
mutex_init(&i->type_and_value_mutex);
mutex_init(&i->identifier_uses_mutex); mutex_init(&i->identifier_uses_mutex);
mutex_init(&i->foreign_mutex); mutex_init(&i->foreign_mutex);
@@ -906,6 +907,7 @@ void destroy_checker_info(CheckerInfo *i) {
mutex_destroy(&i->global_untyped_mutex); mutex_destroy(&i->global_untyped_mutex);
mutex_destroy(&i->type_info_mutex); mutex_destroy(&i->type_info_mutex);
mutex_destroy(&i->deps_mutex); mutex_destroy(&i->deps_mutex);
mutex_destroy(&i->type_and_value_mutex);
mutex_destroy(&i->identifier_uses_mutex); mutex_destroy(&i->identifier_uses_mutex);
mutex_destroy(&i->foreign_mutex); mutex_destroy(&i->foreign_mutex);
} }
@@ -1165,25 +1167,23 @@ void add_type_and_value(CheckerInfo *i, Ast *expr, AddressingMode mode, Type *ty
return; return;
} }
mutex_lock(&i->type_and_value_mutex);
Ast *prev_expr = nullptr; Ast *prev_expr = nullptr;
for (;;) { while (prev_expr != expr) {
if (prev_expr != expr) { prev_expr = expr;
expr->tav.mode = mode; expr->tav.mode = mode;
expr->tav.type = type; expr->tav.type = type;
if (mode == Addressing_Constant || mode == Addressing_Invalid) { if (mode == Addressing_Constant || mode == Addressing_Invalid) {
expr->tav.value = value; expr->tav.value = value;
} else if (mode == Addressing_Value && is_type_typeid(type)) { } else if (mode == Addressing_Value && is_type_typeid(type)) {
expr->tav.value = value; expr->tav.value = value;
} else if (mode == Addressing_Value && is_type_proc(type)) { } else if (mode == Addressing_Value && is_type_proc(type)) {
expr->tav.value = value; expr->tav.value = value;
}
prev_expr = expr;
} else {
break;
} }
expr = unparen_expr(expr); expr = unparen_expr(expr);
} }
mutex_unlock(&i->type_and_value_mutex);
} }
void add_entity_definition(CheckerInfo *i, Ast *identifier, Entity *entity) { void add_entity_definition(CheckerInfo *i, Ast *identifier, Entity *entity) {
src/checker.hpp
+2
View File
@@ -306,6 +306,8 @@ struct CheckerInfo {
// too much of a problem in practice // too much of a problem in practice
BlockingMutex deps_mutex; BlockingMutex deps_mutex;
BlockingMutex type_and_value_mutex;
RecursiveMutex lazy_mutex; // Mutex required for lazy type checking of specific files RecursiveMutex lazy_mutex; // Mutex required for lazy type checking of specific files
RecursiveMutex gen_procs_mutex; RecursiveMutex gen_procs_mutex;