Merge branch 'master' of github.com:odin-lang/odin

1 files changed, 25 insertions, 14 deletions

diff --git a/src/ir.cpp b/src/ir.cpp
index 8467b52fe..eb9ba8979 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -905,7 +905,9 @@ irValue *ir_instr_local(irProcedure *p, Entity *e, bool zero_initialized) {
 	i->Local.entity = e;
 	i->Local.type = make_type_pointer(p->module->allocator, e->type);
 	i->Local.zero_initialized = zero_initialized;
-	i->Local.alignment = type_align_of(p->module->allocator, e->type);
+	// i->Local.alignment = type_align_of(p->module->allocator, e->type);
+	// TODO(bill): determine the correct alignment
+	i->Local.alignment = gb_max(16, type_align_of(p->module->allocator, e->type));
 	array_init(&i->Local.referrers, heap_allocator()); // TODO(bill): Replace heap allocator here
 	ir_module_add_value(p->module, e, v);
 	return v;
@@ -1611,6 +1613,19 @@ irValue *ir_emit_comment(irProcedure *p, String text) {
 	return ir_emit(p, ir_instr_comment(p, text));
 }
 
+void ir_emit_init_context(irProcedure *proc, irValue *c = nullptr) {
+	irModule *m = proc->module;
+	gbAllocator a = m->allocator;
+	irValue **args = gb_alloc_array(a, irValue *, 1);
+	args[0] = c ? c : m->global_default_context;
+	ir_emit_global_call(proc, "__init_context", args, 1);
+}
+
+
+
+
+
+
 irValue *ir_copy_value_to_ptr(irProcedure *proc, irValue *val, Type *new_type, i64 alignment) {
 	i64 type_alignment = type_align_of(proc->module->allocator, new_type);
 	if (alignment < type_alignment) {
@@ -1628,14 +1643,21 @@ irValue *ir_emit_bitcast(irProcedure *proc, irValue *data, Type *type) {
 
 irValue *ir_emit_transmute(irProcedure *proc, irValue *value, Type *t);
 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_find_or_generate_context_ptr(irProcedure *proc) {
 	if (proc->context_stack.count > 0) {
 		return proc->context_stack[proc->context_stack.count-1];
 	}
 	irValue *c = ir_add_local_generated(proc, t_context);
-	ir_emit_store(proc, c, ir_emit_load(proc, proc->module->global_default_context));
 	array_add(&proc->context_stack, c);
+	ir_emit_store(proc, c, ir_emit_load(proc, proc->module->global_default_context));
+
+	irValue *ep = ir_emit_struct_ep(proc, c, 0);
+	irValue *v = ir_emit_global_call(proc, "default_allocator", nullptr, 0);
+	ir_emit_store(proc, ep, v);
+
 	return c;
 }
 
@@ -1790,15 +1812,9 @@ void ir_emit_if(irProcedure *proc, irValue *cond, irBlock *true_block, irBlock *
 	ir_start_block(proc, nullptr);
 }
 
-void ir_emit_startup_runtime(irProcedure *proc) {
-	GB_ASSERT(proc->parent == nullptr && proc->name == "main");
-	ir_emit(proc, ir_alloc_instr(proc, irInstr_StartupRuntime));
-}
-
 
 
 
-irValue *ir_emit_struct_ep(irProcedure *proc, irValue *s, i32 index);
 irValue *ir_emit_comp(irProcedure *proc, TokenKind op_kind, irValue *left, irValue *right);
 
 irValue *ir_gen_map_header(irProcedure *proc, irValue *map_val_ptr, Type *map_type) {
@@ -8671,12 +8687,7 @@ void ir_gen_tree(irGen *s) {
 		ir_begin_procedure_body(proc);
 		defer (ir_end_procedure_body(proc));
 
-		{
-			irValue **args = gb_alloc_array(a, irValue *, 1);
-			args[0] = m->global_default_context;
-			ir_emit_global_call(proc, "__init_context", args, 1);
-		}
-
+		ir_emit_init_context(proc);
 
 		ir_setup_type_info_data(proc);