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

Fix minimum dependency generation for foreign entities

Browse Source
This commit is contained in:
gingerBill
2018-01-28 14:39:18 +00:00
parent 0361a18551
commit 1a0877e965
3 changed files with 64 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/checker.cpp
View File

@@ -1110,10 +1110,27 @@ void add_dependency_to_map(PtrSet<Entity *> *map, CheckerInfo *info, Entity *ent
ptr_set_add(map, entity);
DeclInfo *decl = decl_info_of_entity(info, entity);
if (decl != nullptr) {
for_array(i, decl->deps.entries) {
Entity *e = decl->deps.entries[i].ptr;
add_dependency_to_map(map, info, e);
if (decl == nullptr) {
return;
}
for_array(i, decl->deps.entries) {
Entity *e = decl->deps.entries[i].ptr;
add_dependency_to_map(map, info, e);
if (e->kind == Entity_Procedure && e->Procedure.is_foreign) {
Entity *fl = e->Procedure.foreign_library;
GB_ASSERT_MSG(fl != nullptr &&
fl->kind == Entity_LibraryName &&
fl->LibraryName.used,
"%.*s", LIT(name));
add_dependency_to_map(map, info, fl);
}
if (e->kind == Entity_Variable && e->Variable.is_foreign) {
Entity *fl = e->Variable.foreign_library;
GB_ASSERT_MSG(fl != nullptr &&
fl->kind == Entity_LibraryName &&
fl->LibraryName.used,
"%.*s", LIT(name));
add_dependency_to_map(map, info, fl);
}
}
}
@@ -1130,17 +1147,10 @@ PtrSet<Entity *> generate_minimum_dependency_set(CheckerInfo *info, Entity *star
// NOTE(bill): Require runtime stuff
add_dependency_to_map(&map, info, e);
}
} else if (e->kind == Entity_Procedure) {
if (e->Procedure.is_export) {
add_dependency_to_map(&map, info, e);
}
if (e->Procedure.is_foreign) {
add_dependency_to_map(&map, info, e->Procedure.foreign_library);
}
} else if (e->kind == Entity_Variable) {
if (e->Variable.is_export) {
add_dependency_to_map(&map, info, e);
}
} else if (e->kind == Entity_Procedure && e->Procedure.is_export) {
add_dependency_to_map(&map, info, e);
} else if (e->kind == Entity_Variable && e->Procedure.is_export) {
add_dependency_to_map(&map, info, e);
}
}