Commit e621ad014e919521268d3e2c94afadbdadadb59f | zig

example/cat/main.zig+4-4

...	@@ -10,7 +10,7 @@ pub fn main(args: [][]u8) -> %void {	...	@@ -10,7 +10,7 @@ pub fn main(args: [][]u8) -> %void {
10	for (args[1...]) \|arg\| {	10	for (args[1...]) \|arg\| {
11	if (str.eql(arg, "-")) {	11	if (str.eql(arg, "-")) {
12	catted_anything = true;	12	catted_anything = true;
13	cat_stream(io.stdin) %% \|err\| return err;	13	cat_stream(&io.stdin) %% \|err\| return err;
14	} else if (arg[0] == '-') {	14	} else if (arg[0] == '-') {
15	return usage(exe);	15	return usage(exe);
16	} else {	16	} else {
...	@@ -24,11 +24,11 @@ pub fn main(args: [][]u8) -> %void {	...	@@ -24,11 +24,11 @@ pub fn main(args: [][]u8) -> %void {
24	defer %%is.close();	24	defer %%is.close();
25		25
26	catted_anything = true;	26	catted_anything = true;
27	cat_stream(is) %% \|err\| return err;	27	cat_stream(&is) %% \|err\| return err;
28	}	28	}
29	}	29	}
30	if (!catted_anything) {	30	if (!catted_anything) {
31	cat_stream(io.stdin) %% \|err\| return err;	31	cat_stream(&io.stdin) %% \|err\| return err;
32	}	32	}
33	io.stdout.flush() %% \|err\| return err;	33	io.stdout.flush() %% \|err\| return err;
34	}	34	}
...	@@ -40,7 +40,7 @@ fn usage(exe: []u8) -> %void {	...	@@ -40,7 +40,7 @@ fn usage(exe: []u8) -> %void {
40	return error.Invalid;	40	return error.Invalid;
41	}	41	}
42		42
43	fn cat_stream(is: io.InStream) -> %void {	43	fn cat_stream(is: &io.InStream) -> %void {
44	var buf: [1024 * 4]u8 = undefined;	44	var buf: [1024 * 4]u8 = undefined;
45		45
46	while (true) {	46	while (true) {

src/ir.cpp+48-21

 @@ -721,17 +721,23 @@ static IrInstruction *ir_build_bin_op_from(IrBuilder *irb, IrInstruction *old_in
     return new_instruction;
 }
-static IrInstruction *ir_build_var_ptr(IrBuilder *irb, Scope *scope, AstNode *source_node, VariableTableEntry *var) {
+static IrInstruction *ir_build_var_ptr(IrBuilder *irb, Scope *scope, AstNode *source_node,
+        VariableTableEntry *var, bool is_const)
+{
     IrInstructionVarPtr *instruction = ir_build_instruction<IrInstructionVarPtr>(irb, scope, source_node);
     instruction->var = var;
+    instruction->is_const = is_const;
     ir_ref_var(var);
     return &instruction->base;
 }
-static IrInstruction *ir_build_var_ptr_from(IrBuilder *irb, IrInstruction *old_instruction, VariableTableEntry *var) {
+static IrInstruction *ir_build_var_ptr_from(IrBuilder *irb, IrInstruction *old_instruction,
-    IrInstruction *new_instruction = ir_build_var_ptr(irb, old_instruction->scope, old_instruction->source_node, var);
+        VariableTableEntry *var, bool is_const)
+{
+    IrInstruction *new_instruction = ir_build_var_ptr(irb, old_instruction->scope,
+            old_instruction->source_node, var, is_const);
     ir_link_new_instruction(new_instruction, old_instruction);
     return new_instruction;
 @@ -3401,7 +3407,7 @@ static IrInstruction *ir_gen_decl_ref(IrBuilder *irb, AstNode *source_node, Tld
         {
             TldVar *tld_var = (TldVar *)tld;
             VariableTableEntry *var = tld_var->var;
-            IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, source_node, var);
+            IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, source_node, var, false);
             if (lval != LValPurposeNone)
                 return var_ptr;
             else
 @@ -3449,7 +3455,7 @@ static IrInstruction *ir_gen_symbol(IrBuilder *irb, Scope *scope, AstNode *node,
     VariableTableEntry *var = find_variable(irb->codegen, scope, variable_name);
     if (var) {
-        IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, node, var);
+        IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, node, var, lval == LValPurposeAddressOfConst);
         if (lval != LValPurposeNone)
             return var_ptr;
         else
 @@ -4309,7 +4315,7 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, Scope *parent_scope, AstNo
     IrInstruction *undefined_value = ir_build_const_undefined(irb, child_scope, elem_node);
     ir_build_var_decl(irb, child_scope, elem_node, elem_var, elem_var_type, undefined_value);
-    IrInstruction *elem_var_ptr = ir_build_var_ptr(irb, child_scope, node, elem_var);
+    IrInstruction *elem_var_ptr = ir_build_var_ptr(irb, child_scope, node, elem_var, false);
     AstNode *index_var_source_node;
     VariableTableEntry *index_var;
 @@ -4327,7 +4333,7 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, Scope *parent_scope, AstNo
     IrInstruction *zero = ir_build_const_usize(irb, child_scope, node, 0);
     IrInstruction *one = ir_build_const_usize(irb, child_scope, node, 1);
     ir_build_var_decl(irb, child_scope, index_var_source_node, index_var, usize, zero);
-    IrInstruction *index_ptr = ir_build_var_ptr(irb, child_scope, node, index_var);
+    IrInstruction *index_ptr = ir_build_var_ptr(irb, child_scope, node, index_var, false);
     IrBasicBlock *cond_block = ir_build_basic_block(irb, child_scope, "ForCond");
 @@ -4351,7 +4357,7 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, Scope *parent_scope, AstNo
     } else {
         elem_val = ir_build_load_ptr(irb, child_scope, node, elem_ptr);
     }
-    ir_build_store_ptr(irb, child_scope, node, elem_var_ptr, elem_val);
+    ir_mark_gen(ir_build_store_ptr(irb, child_scope, node, elem_var_ptr, elem_val));
     LoopStackItem *loop_stack_item = irb->loop_stack.add_one();
     loop_stack_item->break_block = end_block;
 @@ -4365,7 +4371,7 @@ static IrInstruction *ir_gen_for_expr(IrBuilder *irb, Scope *parent_scope, AstNo
     ir_set_cursor_at_end(irb, continue_block);
     IrInstruction *new_index_val = ir_build_bin_op(irb, child_scope, node, IrBinOpAdd, index_val, one, false);
-    ir_build_store_ptr(irb, child_scope, node, index_ptr, new_index_val);
+    ir_mark_gen(ir_build_store_ptr(irb, child_scope, node, index_ptr, new_index_val));
     ir_build_br(irb, child_scope, node, cond_block, is_comptime);
     ir_set_cursor_at_end(irb, end_block);
 @@ -7545,9 +7551,15 @@ static TypeTableEntry *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCall *cal
         size_t next_proto_i = 0;
         if (first_arg_ptr) {
-            IrInstruction *first_arg = ir_get_deref(ira, first_arg_ptr, first_arg_ptr);
+            IrInstruction *first_arg;
-            if (first_arg->value.type->id == TypeTableEntryIdInvalid)
+            assert(first_arg_ptr->value.type->id == TypeTableEntryIdPointer);
-                return ira->codegen->builtin_types.entry_invalid;
+            if (handle_is_ptr(first_arg_ptr->value.type->data.pointer.child_type)) {
+                first_arg = first_arg_ptr;
+            } else {
+                first_arg = ir_get_deref(ira, first_arg_ptr, first_arg_ptr);
+                if (first_arg->value.type->id == TypeTableEntryIdInvalid)
+                    return ira->codegen->builtin_types.entry_invalid;
+            }
             if (!ir_analyze_fn_call_generic_arg(ira, fn_proto_node, first_arg, &impl_fn->child_scope,
                 &next_proto_i, generic_id, &fn_type_id, casted_args, impl_fn))
 @@ -7612,9 +7624,15 @@ static TypeTableEntry *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCall *cal
     IrInstruction **casted_args = allocate<IrInstruction *>(call_param_count);
     size_t next_arg_index = 0;
     if (first_arg_ptr) {
-        IrInstruction *first_arg = ir_get_deref(ira, first_arg_ptr, first_arg_ptr);
+        IrInstruction *first_arg;
-        if (first_arg->value.type->id == TypeTableEntryIdInvalid)
+        assert(first_arg_ptr->value.type->id == TypeTableEntryIdPointer);
-            return ira->codegen->builtin_types.entry_invalid;
+        if (handle_is_ptr(first_arg_ptr->value.type->data.pointer.child_type)) {
+            first_arg = first_arg_ptr;
+        } else {
+            first_arg = ir_get_deref(ira, first_arg_ptr, first_arg_ptr);
+            if (first_arg->value.type->id == TypeTableEntryIdInvalid)
+                return ira->codegen->builtin_types.entry_invalid;
+        }
         TypeTableEntry *param_type = fn_type_id->param_info[next_arg_index].type;
         if (param_type->id == TypeTableEntryIdInvalid)
 @@ -8090,7 +8108,9 @@ static TypeTableEntry *ir_analyze_instruction_phi(IrAnalyze *ira, IrInstructionP
     return resolved_type;
 }
-static TypeTableEntry *ir_analyze_var_ptr(IrAnalyze *ira, IrInstruction *instruction, VariableTableEntry *var) {
+static TypeTableEntry *ir_analyze_var_ptr(IrAnalyze *ira, IrInstruction *instruction,
+        VariableTableEntry *var, bool is_const_ptr)
+{
     assert(var->value.type);
     if (var->value.type->id == TypeTableEntryIdInvalid)
         return var->value.type;
 @@ -8110,9 +8130,10 @@ static TypeTableEntry *ir_analyze_var_ptr(IrAnalyze *ira, IrInstruction *instruc
     if (mem_slot && mem_slot->special != ConstValSpecialRuntime) {
         ConstPtrSpecial ptr_special = is_comptime ? ConstPtrSpecialInline : ConstPtrSpecialNone;
-        return ir_analyze_const_ptr(ira, instruction, mem_slot, var->value.type, false, ptr_special, var->src_is_const);
+        bool is_const = (var->value.type->id == TypeTableEntryIdMetaType) ? is_const_ptr : var->src_is_const;
+        return ir_analyze_const_ptr(ira, instruction, mem_slot, var->value.type, false, ptr_special, is_const);
     } else {
-        ir_build_var_ptr_from(&ira->new_irb, instruction, var);
+        ir_build_var_ptr_from(&ira->new_irb, instruction, var, false);
         type_ensure_zero_bits_known(ira->codegen, var->value.type);
         return get_pointer_to_type(ira->codegen, var->value.type, var->src_is_const);
     }
 @@ -8120,7 +8141,7 @@ static TypeTableEntry *ir_analyze_var_ptr(IrAnalyze *ira, IrInstruction *instruc
 static TypeTableEntry *ir_analyze_instruction_var_ptr(IrAnalyze *ira, IrInstructionVarPtr *var_ptr_instruction) {
     VariableTableEntry *var = var_ptr_instruction->var;
-    return ir_analyze_var_ptr(ira, &var_ptr_instruction->base, var);
+    return ir_analyze_var_ptr(ira, &var_ptr_instruction->base, var, var_ptr_instruction->is_const);
 }
 static TypeTableEntry *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstructionElemPtr *elem_ptr_instruction) {
 @@ -8313,7 +8334,7 @@ static TypeTableEntry *ir_analyze_decl_ref(IrAnalyze *ira, IrInstruction *source
         {
             TldVar *tld_var = (TldVar *)tld;
             VariableTableEntry *var = tld_var->var;
-            return ir_analyze_var_ptr(ira, source_instruction, var);
+            return ir_analyze_var_ptr(ira, source_instruction, var, false);
         }
         case TldIdFn:
         {
 @@ -8549,6 +8570,12 @@ static TypeTableEntry *ir_analyze_instruction_store_ptr(IrAnalyze *ira, IrInstru
     if (value->value.type->id == TypeTableEntryIdInvalid)
         return value->value.type;
+    assert(ptr->value.type->id == TypeTableEntryIdPointer);
+    if (ptr->value.type->data.pointer.is_const && !store_ptr_instruction->base.is_gen) {
+        ir_add_error(ira, &store_ptr_instruction->base, buf_sprintf("cannot assign to constant"));
+        return ira->codegen->builtin_types.entry_invalid;
+    }
     TypeTableEntry *child_type = ptr->value.type->data.pointer.child_type;
     IrInstruction *casted_value = ir_implicit_cast(ira, value, child_type);
     if (casted_value == ira->codegen->invalid_instruction)
 @@ -8580,7 +8607,7 @@ static TypeTableEntry *ir_analyze_instruction_store_ptr(IrAnalyze *ira, IrInstru
             IrInstructionVarPtr *var_ptr_inst = (IrInstructionVarPtr *)ptr;
             VariableTableEntry *var = var_ptr_inst->var;
             new_ptr_inst = ir_build_var_ptr(&ira->new_irb, store_ptr_instruction->base.scope,
-                store_ptr_instruction->base.source_node, var);
+                store_ptr_instruction->base.source_node, var, false);
             assert(var->mem_slot_index != SIZE_MAX);
             ConstExprValue *mem_slot = &ira->exec_context.mem_slot_list[var->mem_slot_index];
             mem_slot->special = ConstValSpecialRuntime;

std/cstr.zig+2-2

...	@@ -39,7 +39,7 @@ pub const CBuf = struct {	...	@@ -39,7 +39,7 @@ pub const CBuf = struct {
39		39
40	/// Must deinitialize with deinit.	40	/// Must deinitialize with deinit.
41	pub fn initEmpty(allocator: &Allocator) -> %CBuf {	41	pub fn initEmpty(allocator: &Allocator) -> %CBuf {
42	const self = CBuf {	42	var self = CBuf {
43	.list = List(u8).init(allocator),	43	.list = List(u8).init(allocator),
44	};	44	};
45	%return self.resize(0);	45	%return self.resize(0);
...	@@ -48,7 +48,7 @@ pub const CBuf = struct {	...	@@ -48,7 +48,7 @@ pub const CBuf = struct {
48		48
49	/// Must deinitialize with deinit.	49	/// Must deinitialize with deinit.
50	pub fn initFromMem(allocator: &Allocator, m: []const u8) -> %CBuf {	50	pub fn initFromMem(allocator: &Allocator, m: []const u8) -> %CBuf {
51	const self = CBuf {	51	var self = CBuf {
52	.list = List(u8).init(allocator),	52	.list = List(u8).init(allocator),
53	};	53	};
54	%return self.resize(m.len);	54	%return self.resize(m.len);

std/list.zig+1-1

...	@@ -23,7 +23,7 @@ pub fn List(inline T: type) -> type{	...	@@ -23,7 +23,7 @@ pub fn List(inline T: type) -> type{
23	l.allocator.free(T, l.items);	23	l.allocator.free(T, l.items);
24	}	24	}
25		25
26	pub fn toSlice(l: &Self) -> []T {	26	pub fn toSlice(l: &const Self) -> []const T {
27	return l.items[0...l.len];	27	return l.items[0...l.len];
28	}	28	}
29		29

test/cases/enum_with_members.zig+1-1

...	@@ -6,7 +6,7 @@ const ET = enum {	...	@@ -6,7 +6,7 @@ const ET = enum {
6	SINT: i32,	6	SINT: i32,
7	UINT: u32,	7	UINT: u32,
8		8
9	pub fn print(a: &ET, buf: []u8) -> %usize {	9	pub fn print(a: &const ET, buf: []u8) -> %usize {
10	return switch (*a) {	10	return switch (*a) {
11	ET.SINT => \|x\| { io.bufPrintInt(i32, buf, x) },	11	ET.SINT => \|x\| { io.bufPrintInt(i32, buf, x) },
12	ET.UINT => \|x\| { io.bufPrintInt(u32, buf, x) },	12	ET.UINT => \|x\| { io.bufPrintInt(u32, buf, x) },

test/cases/misc.zig+7

...	@@ -490,3 +490,10 @@ const test_pointer_to_void_return_type_x = void{};	...	@@ -490,3 +490,10 @@ const test_pointer_to_void_return_type_x = void{};
490	fn testPointerToVoidReturnType2() -> &const void {	490	fn testPointerToVoidReturnType2() -> &const void {
491	return &test_pointer_to_void_return_type_x;	491	return &test_pointer_to_void_return_type_x;
492	}	492	}
		493
		494
		495	fn nonConstPtrToAliasedType() {
		496	@setFnTest(this);
		497	const int = i32;
		498	assert(?&int == ?&i32);
		499	}

test/cases/struct.zig+2-2

...	@@ -155,7 +155,7 @@ fn memberFunctions() {	...	@@ -155,7 +155,7 @@ fn memberFunctions() {
155	}	155	}
156	const MemberFnRand = struct {	156	const MemberFnRand = struct {
157	seed: u32,	157	seed: u32,
158	pub fn getSeed(r: MemberFnRand) -> u32 {	158	pub fn getSeed(r: &const MemberFnRand) -> u32 {
159	r.seed	159	r.seed
160	}	160	}
161	};	161	};
...	@@ -184,7 +184,7 @@ fn emptyStructMethodCall() {	...	@@ -184,7 +184,7 @@ fn emptyStructMethodCall() {
184	assert(es.method() == 1234);	184	assert(es.method() == 1234);
185	}	185	}
186	const EmptyStruct = struct {	186	const EmptyStruct = struct {
187	fn method(es: EmptyStruct) -> i32 {	187	fn method(es: &const EmptyStruct) -> i32 {
188	1234	188	1234
189	}	189	}
190	};	190	};

test/run_tests.cpp+5-5

...	@@ -548,7 +548,7 @@ const B = struct {	...	@@ -548,7 +548,7 @@ const B = struct {
548	const C = struct {	548	const C = struct {
549	x: i32,	549	x: i32,
550		550
551	fn d(c: C) {	551	fn d(c: &const C) {
552	%%io.stdout.printf("OK\n");	552	%%io.stdout.printf("OK\n");
553	}	553	}
554	};	554	};
...	@@ -577,13 +577,13 @@ const io = @import("std").io;	...	@@ -577,13 +577,13 @@ const io = @import("std").io;
577	const Foo = struct {	577	const Foo = struct {
578	field1: Bar,	578	field1: Bar,
579		579
580	fn method(a: &Foo) -> bool { true }	580	fn method(a: &const Foo) -> bool { true }
581	};	581	};
582		582
583	const Bar = struct {	583	const Bar = struct {
584	field2: i32,	584	field2: i32,
585		585
586	fn method(b: &Bar) -> bool { true }	586	fn method(b: &const Bar) -> bool { true }
587	};	587	};
588		588
589	pub fn main(args: [][]u8) -> %void {	589	pub fn main(args: [][]u8) -> %void {
...	@@ -787,14 +787,14 @@ fn f(a : unreachable) {}	...	@@ -787,14 +787,14 @@ fn f(a : unreachable) {}
787	fn f() {	787	fn f() {
788	3 = 3;	788	3 = 3;
789	}	789	}
790	)SOURCE", 1, ".tmp_source.zig:3:5: error: invalid assignment target");	790	)SOURCE", 1, ".tmp_source.zig:3:7: error: cannot assign to constant");
791		791
792	add_compile_fail_case("assign to constant variable", R"SOURCE(	792	add_compile_fail_case("assign to constant variable", R"SOURCE(
793	fn f() {	793	fn f() {
794	const a = 3;	794	const a = 3;
795	a = 4;	795	a = 4;
796	}	796	}
797	)SOURCE", 1, ".tmp_source.zig:4:5: error: cannot assign to constant");	797	)SOURCE", 1, ".tmp_source.zig:4:7: error: cannot assign to constant");
798		798
799	add_compile_fail_case("use of undeclared identifier", R"SOURCE(	799	add_compile_fail_case("use of undeclared identifier", R"SOURCE(
800	fn f() {	800	fn f() {

author	Andrew Kelley <andrew@ziglang.org> 2017-01-05 18:50:36-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2017-01-05 18:50:36-05:00
log	e621ad014e919521268d3e2c94afadbdadadb59f
tree	a038e0051b6d8c9b220cb2faa2918eb3f42fa909
parent	97e105489085fcf4530b3944499531d76848bbd1

pass cannot assign to constant test