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

Add default_assertion_failure_proc to the minimum dependency build

Browse Source
This commit is contained in:
gingerBill
2018-08-29 21:15:11 +01:00
parent ae57284912
commit 6c18864291
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/checker.cpp
+1
View File
@@ -1306,6 +1306,7 @@ void generate_minimum_dependency_set(Checker *c, Entity *start) {
String required_runtime_entities[] = { String required_runtime_entities[] = {
str_lit("__init_context"), str_lit("__init_context"),
str_lit("default_assertion_failure_proc"),
str_lit("args__"), str_lit("args__"),
str_lit("type_table"), str_lit("type_table"),
src/ir.cpp
+11 -5
View File
@@ -1644,6 +1644,14 @@ irValue *ir_address_from_load_or_generate_local(irProcedure *proc, irValue *val)
irValue *ir_emit_struct_ep(irProcedure *proc, irValue *s, i32 index); irValue *ir_emit_struct_ep(irProcedure *proc, irValue *s, i32 index);
irValue *ir_get_package_value(irModule *m, String package_name, String entity_name) {
AstPackage *rt_pkg = get_core_package(m->info, package_name);
Entity *e = scope_lookup_current(rt_pkg->scope, entity_name);
irValue **found = map_get(&m->values, hash_entity(e));
GB_ASSERT_MSG(found != nullptr, "%.*s", LIT(e->token.string));
return *found;
}
irValue *ir_find_or_generate_context_ptr(irProcedure *proc) { irValue *ir_find_or_generate_context_ptr(irProcedure *proc) {
if (proc->context_stack.count > 0) { if (proc->context_stack.count > 0) {
return proc->context_stack[proc->context_stack.count-1].value; return proc->context_stack[proc->context_stack.count-1].value;
@@ -1662,14 +1670,12 @@ irValue *ir_find_or_generate_context_ptr(irProcedure *proc) {
#if 1 #if 1
Array<irValue *> args = {}; Array<irValue *> args = {};
ir_emit_store(proc, ir_emit_struct_ep(proc, c, 0), ir_emit_package_call(proc, "os", "heap_allocator", args)); ir_emit_store(proc, ir_emit_struct_ep(proc, c, 0), ir_emit_package_call(proc, "os", "heap_allocator", args));
// 1 will be handled later
ir_emit_store(proc, ir_emit_struct_ep(proc, c, 2), ir_emit_package_call(proc, "os", "current_thread_id", args)); ir_emit_store(proc, ir_emit_struct_ep(proc, c, 2), ir_emit_package_call(proc, "os", "current_thread_id", args));
ir_emit_store(proc, ir_emit_struct_ep(proc, c, 3), ir_get_package_value(proc->module, str_lit("runtime"), str_lit("default_assertion_failure_proc")));
array_init(&args, heap_allocator(), 1); array_init(&args, heap_allocator(), 1);
AstPackage *rt_pkg = get_core_package(proc->module->info, str_lit("runtime")); args[0] = ir_get_package_value(proc->module, str_lit("runtime"), str_lit("global_scratch_allocator_data"));
Entity *e = scope_lookup_current(rt_pkg->scope, str_lit("global_scratch_allocator_data"));
irValue **found = map_get(&proc->module->values, hash_entity(e));
GB_ASSERT_MSG(found != nullptr, "%.*s", LIT(e->token.string));
args[0] = *found;
ir_emit_store(proc, ir_emit_struct_ep(proc, c, 1), ir_emit_package_call(proc, "mem", "scratch_allocator", args)); ir_emit_store(proc, ir_emit_struct_ep(proc, c, 1), ir_emit_package_call(proc, "mem", "scratch_allocator", args));
#else #else
ir_emit_init_context(proc, c); ir_emit_init_context(proc, c);