aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2017-04-02 18:28:45 +0100
committerGinger Bill <bill@gingerbill.org>2017-04-02 18:28:45 +0100
commit01da0d1377cee93d51d5fa7175ba1b8b626c243f (patch)
treeea8761802176bf7440509b085ed15a2748ff22c5
parent8ce58573dfa2c140dcafd633e51c56d555f7ebc1 (diff)
Fix make for dynamic arrays
-rw-r--r--core/os_windows.odin2
-rw-r--r--src/ir.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/os_windows.odin b/core/os_windows.odin
index 157bb7b55..ecb093ab4 100644
--- a/core/os_windows.odin
+++ b/core/os_windows.odin
@@ -49,7 +49,7 @@ ERROR_FILE_IS_PIPE: Errno : 1<<29 + 0;
// "Argv" arguments converted to Odin strings
-args := _alloc_command_line_arguments();
+immutable args := _alloc_command_line_arguments();
open :: proc(path: string, mode: int, perm: u32) -> (Handle, Errno) {
diff --git a/src/ir.c b/src/ir.c
index a901ada4e..58d6aa7dd 100644
--- a/src/ir.c
+++ b/src/ir.c
@@ -3748,10 +3748,10 @@ irValue *ir_build_expr(irProcedure *proc, AstNode *expr) {
} else if (is_type_dynamic_array(type)) {
Type *elem_type = base_type(type)->DynamicArray.elem;
irValue *len = v_zero;
- irValue *cap = ir_const_int(a, 8);
if (ce->args.count > 1) {
len = ir_emit_conv(proc, ir_build_expr(proc, ce->args.e[1]), t_int);
}
+ irValue *cap = len;
if (ce->args.count > 2) {
cap = ir_emit_conv(proc, ir_build_expr(proc, ce->args.e[2]), t_int);
}