mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-04 04:02:33 +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

1
src/check_decl.cpp
View File

@@ -425,6 +425,7 @@ void init_entity_foreign_library(Checker *c, Entity *e) {
} else {
// TODO(bill): Extra stuff to do with library names?
*foreign_library = found;
found->LibraryName.used = true;
add_entity_use(c, ident, found);
}
}

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);
}
}

58
src/ir.cpp
View File

@@ -1347,6 +1347,30 @@ irValue *ir_add_global_string_array(irModule *m, String string) {
return g;
}
void ir_add_foreign_library_path(irModule *m, Entity *e) {
GB_ASSERT(e != nullptr);
GB_ASSERT(e->kind == Entity_LibraryName);
GB_ASSERT(e->LibraryName.used);
String library_path = e->LibraryName.path;
if (library_path.len == 0) {
return;
}
for_array(path_index, m->foreign_library_paths) {
String path = m->foreign_library_paths[path_index];
#if defined(GB_SYSTEM_WINDOWS)
if (str_eq_ignore_case(path, library_path)) {
#else
if (str_eq(path, library_path)) {
#endif
return;
}
}
array_add(&m->foreign_library_paths, library_path);
}
@@ -1380,9 +1404,9 @@ irValue *ir_add_local_for_identifier(irProcedure *proc, AstNode *ident, bool zer
HashKey key = hash_string(name);
irValue **prev_value = map_get(&proc->module->members, key);
if (prev_value == nullptr) {
ir_add_foreign_library_path(proc->module, e->Variable.foreign_library);
// NOTE(bill): Don't do mutliple declarations in the IR
irValue *g = ir_value_global(proc->module->allocator, e, nullptr);
g->Global.name = name;
g->Global.is_foreign = true;
ir_module_add_value(proc->module, e, g);
@@ -6163,6 +6187,11 @@ void ir_build_constant_value_decl(irProcedure *proc, AstNodeValueDecl *vd) {
// FFI - Foreign function interace
String original_name = e->token.string;
String name = original_name;
if (e->Procedure.is_foreign) {
ir_add_foreign_library_path(proc->module, e->Procedure.foreign_library);
}
if (e->Procedure.link_name.len > 0) {
name = e->Procedure.link_name;
}
@@ -7775,25 +7804,6 @@ irValue *ir_type_info_member_usings_offset(irProcedure *proc, isize count) {
void ir_add_foreign_library_path(irModule *m, Entity *e) {
GB_ASSERT(e != nullptr);
String library_path = e->LibraryName.path;
if (library_path.len == 0) {
return;
}
for_array(path_index, m->foreign_library_paths) {
String path = m->foreign_library_paths[path_index];
#if defined(GB_SYSTEM_WINDOWS)
if (str_eq_ignore_case(path, library_path)) {
#else
if (str_eq(path, library_path)) {
#endif
return;
}
}
array_add(&m->foreign_library_paths, library_path);
}
void ir_setup_type_info_data(irProcedure *proc) { // NOTE(bill): Setup type_info data
irModule *m = proc->module;
@@ -8681,6 +8691,14 @@ void ir_gen_tree(irGen *s) {
var->init = ir_build_expr(proc, var->decl->init_expr);
}
Entity *e = var->var->Global.entity;
GB_ASSERT(e->kind == Entity_Variable);
if (e->Variable.is_foreign) {
Entity *fl = e->Procedure.foreign_library;
ir_add_foreign_library_path(m, fl);
}
if (var->init != nullptr) {
Type *t = type_deref(ir_type(var->var));