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

Fix race condition from add_entity_use due to Entity.identifier

Browse Source
This commit is contained in:
gingerBill
2021-08-19 17:38:18 +01:00
parent e722af7f61
commit 38841dd46e
6 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/check_decl.cpp
View File

@@ -350,12 +350,12 @@ void override_entity_in_scope(Entity *original_entity, Entity *new_entity) {
original_entity->type = new_entity->type;
original_entity->aliased_of = new_entity;
if (original_entity->identifier == nullptr) {
original_entity->identifier = new_entity->identifier;
}
if (original_entity->identifier != nullptr &&
original_entity->identifier->kind == Ast_Ident) {
original_entity->identifier->Ident.entity = new_entity;
Ast *empty_ident = nullptr;
original_entity->identifier.compare_exchange_strong(empty_ident, new_entity->identifier);
if (original_entity->identifier.load() != nullptr &&
original_entity->identifier.load()->kind == Ast_Ident) {
original_entity->identifier.load()->Ident.entity = new_entity;
}
// IMPORTANT NOTE(bill, 2021-04-10): copy only the variants

2
src/check_type.cpp
View File

@@ -1565,7 +1565,7 @@ Type *check_get_params(CheckerContext *ctx, Scope *scope, Ast *_params, bool *is
if (is_type_proc(op.type)) {
Entity *proc_entity = entity_from_expr(op.expr);
valid = proc_entity != nullptr;
poly_const = exact_value_procedure(proc_entity->identifier ? proc_entity->identifier : op.expr);
poly_const = exact_value_procedure(proc_entity->identifier.load() ? proc_entity->identifier.load() : op.expr);
}
if (!valid) {
if (op.mode == Addressing_Constant) {

6
src/checker.cpp
View File

@@ -1297,9 +1297,9 @@ void add_entity_use(CheckerContext *c, Ast *identifier, Entity *entity) {
if (identifier->kind != Ast_Ident) {
return;
}
if (entity->identifier == nullptr) {
entity->identifier = identifier;
}
Ast *empty_ident = nullptr;
entity->identifier.compare_exchange_strong(empty_ident, identifier);
identifier->Ident.entity = entity;
if (c->info->allow_identifier_uses) {

2
src/entity.cpp
View File

@@ -120,7 +120,7 @@ struct Entity {
Token token;
Scope * scope;
Type * type;
Ast * identifier; // Can be nullptr
std::atomic<Ast *> identifier; // Can be nullptr
DeclInfo * decl_info;
DeclInfo * parent_proc_decl; // nullptr if in file/global scope
AstFile * file;

5
src/llvm_backend.cpp
View File

@@ -1204,8 +1204,9 @@ void lb_generate_code(lbGenerator *gen) {
LLVMBool is_optimized = build_context.optimization_level > 0;
AstFile *init_file = m->info->init_package->files[0];
if (m->info->entry_point && m->info->entry_point->identifier && m->info->entry_point->identifier->file) {
init_file = m->info->entry_point->identifier->file;
Ast *ident = m->info->entry_point->identifier.load();
if (m->info->entry_point && ident && ident->file) {
init_file = ident->file;
}
LLVMBool split_debug_inlining = false;

5
src/llvm_backend_proc.cpp
View File

@@ -211,11 +211,12 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool ignore_body)
scope = p->module->debug_compile_unit;
type = lb_debug_type_internal_proc(m, bt);
Ast *ident = entity->identifier.load();
if (entity->file != nullptr) {
file = lb_get_llvm_metadata(m, entity->file);
scope = file;
} else if (entity->identifier != nullptr && entity->identifier->file != nullptr) {
file = lb_get_llvm_metadata(m, entity->identifier->file);
} else if (ident != nullptr && ident->file != nullptr) {
file = lb_get_llvm_metadata(m, ident->file);
scope = file;
} else if (entity->scope != nullptr) {
file = lb_get_llvm_metadata(m, entity->scope->file);