mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-15 23:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix min dep type info problem caused by const ref of map_set

Browse Source
This commit is contained in:
gingerBill
2023-01-04 22:20:18 +00:00
parent 8a99b8af3e
commit 9455918eec
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/check_decl.cpp
View File

@@ -1576,5 +1576,34 @@ gb_internal bool check_proc_body(CheckerContext *ctx_, Token token, DeclInfo *de
check_scope_usage(ctx->checker, ctx->scope);
// if (decl->parent) {
// Scope *ps = decl->parent->scope;
// if (ps->flags & (ScopeFlag_File & ScopeFlag_Pkg & ScopeFlag_Global)) {
// return true;
// } else {
// // NOTE(bill): Add the dependencies from the procedure literal (lambda)
// // But only at the procedure level
// rw_mutex_shared_lock(&decl->deps_mutex);
// rw_mutex_lock(&decl->parent->deps_mutex);
// for (Entity *e : decl->deps) {
// ptr_set_add(&decl->parent->deps, e);
// }
// rw_mutex_unlock(&decl->parent->deps_mutex);
// rw_mutex_shared_unlock(&decl->deps_mutex);
// rw_mutex_shared_lock(&decl->type_info_deps_mutex);
// rw_mutex_lock(&decl->parent->type_info_deps_mutex);
// for (Type *t : decl->type_info_deps) {
// ptr_set_add(&decl->parent->type_info_deps, t);
// }
// rw_mutex_unlock(&decl->parent->type_info_deps_mutex);
// rw_mutex_shared_unlock(&decl->type_info_deps_mutex);
// }
// }
return true;
}

5
src/checker.cpp
View File

@@ -2030,7 +2030,10 @@ gb_internal void add_min_dep_type_info(Checker *c, Type *t) {
// Type already exists;
return;
}
map_set(set, ti_index, set->entries.count);
// IMPORTANT NOTE(bill): this must be copied as `map_set` takes a const ref
// and effectively assigns the `+1` of the value
isize const count = set->entries.count;
map_set(set, ti_index, count);
// Add nested types
if (t->kind == Type_Named) {

2
src/llvm_backend_type.cpp
View File

@@ -186,7 +186,7 @@ gb_internal void lb_setup_type_info_data(lbProcedure *p) { // NOTE(bill): Setup
if (entry_index <= 0) {
continue;
}
if (entries_handled[entry_index]) {
continue;
}