ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix min dependency check

Browse Source
This commit is contained in:
gingerBill
2018-06-11 22:57:40 +01:00
parent 8236c6d4b7
commit 915dcb0c28
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/checker.cpp
+5 -7
View File
@@ -1243,9 +1243,7 @@ void add_min_dep_type_info(Checker *c, Type *t) {
void add_dependency_to_set(Checker *c, Entity *entity) { void add_dependency_to_set(Checker *c, Entity *entity) {
if (entity == nullptr) { GB_ASSERT(entity != nullptr);
return;
}
CheckerInfo *info = &c->info; CheckerInfo *info = &c->info;
auto *set = &info->minimum_dependency_set; auto *set = &info->minimum_dependency_set;
@@ -1305,7 +1303,7 @@ void generate_minimum_dependency_set(Checker *c, Entity *start) {
ptr_set_init(&c->info.minimum_dependency_set, heap_allocator()); ptr_set_init(&c->info.minimum_dependency_set, heap_allocator());
ptr_set_init(&c->info.minimum_dependency_type_info_set, heap_allocator()); ptr_set_init(&c->info.minimum_dependency_type_info_set, heap_allocator());
String required_builtin_entities[] = { String required_runtime_entities[] = {
str_lit("__init_context"), str_lit("__init_context"),
str_lit("args__"), str_lit("args__"),
@@ -1315,8 +1313,8 @@ void generate_minimum_dependency_set(Checker *c, Entity *start) {
str_lit("Source_Code_Location"), str_lit("Source_Code_Location"),
str_lit("Context"), str_lit("Context"),
}; };
for (isize i = 0; i < gb_count_of(required_builtin_entities); i++) { for (isize i = 0; i < gb_count_of(required_runtime_entities); i++) {
add_dependency_to_set(c, scope_lookup(c->info.runtime_package->scope, required_builtin_entities[i])); add_dependency_to_set(c, scope_lookup(c->info.runtime_package->scope, required_runtime_entities[i]));
} }
AstPackage *mem = get_core_package(&c->info, str_lit("mem")); AstPackage *mem = get_core_package(&c->info, str_lit("mem"));
@@ -1333,7 +1331,7 @@ void generate_minimum_dependency_set(Checker *c, Entity *start) {
str_lit("heap_allocator"), str_lit("heap_allocator"),
}; };
for (isize i = 0; i < gb_count_of(required_os_entities); i++) { for (isize i = 0; i < gb_count_of(required_os_entities); i++) {
add_dependency_to_set(c, scope_lookup(os->scope, required_mem_entities[i])); add_dependency_to_set(c, scope_lookup(os->scope, required_os_entities[i]));
} }