authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-07-19 14:36:31+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-07-23 15:40:12+03:00
log9465906775620a0832b19370b42ef2b193b96356
treee11f3469b911a10799a63cc418c4b30db5680f02
parentcf87026e52f7faa090c5fa922d5649f5ec2f1831

Sema: return `.comptime_field_ptr`s for tuples

2 files changed, 45 insertions(+), 13 deletions(-)

src/Sema.zig+36-13
......@@ -3659,7 +3659,10 @@ fn validateStructInit(
36593659 const field_ptr_extra = sema.code.extraData(Zir.Inst.Field, field_ptr_data.payload_index).data;
36603660 struct_ptr_zir_ref = field_ptr_extra.lhs;
36613661 const field_name = sema.code.nullTerminatedString(field_ptr_extra.field_name_start);
3662 const field_index = try sema.structFieldIndex(block, struct_ty, field_name, field_src);
3662 const field_index = if (struct_ty.isTuple())
3663 try sema.tupleFieldIndex(block, struct_ty, field_name, field_src)
3664 else
3665 try sema.structFieldIndex(block, struct_ty, field_name, field_src);
36633666 if (found_fields[field_index] != 0) {
36643667 const other_field_ptr = found_fields[field_index];
36653668 const other_field_ptr_data = sema.code.instructions.items(.data)[other_field_ptr].pl_node;
......@@ -3701,7 +3704,7 @@ fn validateStructInit(
37013704 }
37023705
37033706 const field_src = init_src; // TODO better source location
3704 const default_field_ptr = try sema.structFieldPtrByIndex(block, init_src, struct_ptr, @intCast(u32, i), field_src, struct_ty);
3707 const default_field_ptr = try sema.structFieldPtrByIndex(block, init_src, struct_ptr, @intCast(u32, i), field_src, struct_ty, true);
37053708 const field_ty = sema.typeOf(default_field_ptr).childType();
37063709 const init = try sema.addConstant(field_ty, default_val);
37073710 try sema.storePtr2(block, init_src, default_field_ptr, init_src, init, field_src, .store);
......@@ -3859,7 +3862,7 @@ fn validateStructInit(
38593862 if (field_ptr != 0) continue;
38603863
38613864 const field_src = init_src; // TODO better source location
3862 const default_field_ptr = try sema.structFieldPtrByIndex(block, init_src, struct_ptr, @intCast(u32, i), field_src, struct_ty);
3865 const default_field_ptr = try sema.structFieldPtrByIndex(block, init_src, struct_ptr, @intCast(u32, i), field_src, struct_ty, true);
38633866 const field_ty = sema.typeOf(default_field_ptr).childType();
38643867 const init = try sema.addConstant(field_ty, field_values[i]);
38653868 try sema.storePtr2(block, init_src, default_field_ptr, init_src, init, field_src, .store);
......@@ -14494,7 +14497,10 @@ fn zirStructInit(
1449414497 const field_src: LazySrcLoc = .{ .node_offset_initializer = field_type_data.src_node };
1449514498 const field_type_extra = sema.code.extraData(Zir.Inst.FieldType, field_type_data.payload_index).data;
1449614499 const field_name = sema.code.nullTerminatedString(field_type_extra.name_start);
14497 const field_index = try sema.structFieldIndex(block, resolved_ty, field_name, field_src);
14500 const field_index = if (resolved_ty.isTuple())
14501 try sema.tupleFieldIndex(block, resolved_ty, field_name, field_src)
14502 else
14503 try sema.structFieldIndex(block, resolved_ty, field_name, field_src);
1449814504 if (field_inits[field_index] != .none) {
1449914505 const other_field_type = found_fields[field_index];
1450014506 const other_field_type_data = zir_datas[other_field_type].pl_node;
......@@ -14649,7 +14655,7 @@ fn finishStructInit(
1464914655 for (field_inits) |field_init, i_usize| {
1465014656 const i = @intCast(u32, i_usize);
1465114657 const field_src = dest_src;
14652 const field_ptr = try sema.structFieldPtrByIndex(block, dest_src, alloc, i, field_src, struct_ty);
14658 const field_ptr = try sema.structFieldPtrByIndex(block, dest_src, alloc, i, field_src, struct_ty, true);
1465314659 try sema.storePtr(block, dest_src, field_ptr, field_init);
1465414660 }
1465514661
......@@ -19398,7 +19404,7 @@ fn fieldVal(
1939819404 },
1939919405 .Struct => if (is_pointer_to) {
1940019406 // Avoid loading the entire struct by fetching a pointer and loading that
19401 const field_ptr = try sema.structFieldPtr(block, src, object, field_name, field_name_src, inner_ty);
19407 const field_ptr = try sema.structFieldPtr(block, src, object, field_name, field_name_src, inner_ty, false);
1940219408 return sema.analyzeLoad(block, src, field_ptr, object_src);
1940319409 } else {
1940419410 return sema.structFieldVal(block, src, object, field_name, field_name_src, inner_ty);
......@@ -19607,7 +19613,7 @@ fn fieldPtr(
1960719613 try sema.analyzeLoad(block, src, object_ptr, object_ptr_src)
1960819614 else
1960919615 object_ptr;
19610 return sema.structFieldPtr(block, src, inner_ptr, field_name, field_name_src, inner_ty);
19616 return sema.structFieldPtr(block, src, inner_ptr, field_name, field_name_src, inner_ty, initializing);
1961119617 },
1961219618 .Union => {
1961319619 const inner_ptr = if (is_pointer_to)
......@@ -19816,6 +19822,7 @@ fn structFieldPtr(
1981619822 field_name: []const u8,
1981719823 field_name_src: LazySrcLoc,
1981819824 unresolved_struct_ty: Type,
19825 initializing: bool,
1981919826) CompileError!Air.Inst.Ref {
1982019827 assert(unresolved_struct_ty.zigTypeTag() == .Struct);
1982119828
......@@ -19828,10 +19835,10 @@ fn structFieldPtr(
1982819835 return sema.analyzeRef(block, src, len_inst);
1982919836 }
1983019837 const field_index = try sema.tupleFieldIndex(block, struct_ty, field_name, field_name_src);
19831 return sema.tupleFieldPtr(block, src, struct_ptr, field_name_src, field_index);
19838 return sema.tupleFieldPtr(block, src, struct_ptr, field_name_src, field_index, initializing);
1983219839 } else if (struct_ty.isAnonStruct()) {
1983319840 const field_index = try sema.anonStructFieldIndex(block, struct_ty, field_name, field_name_src);
19834 return sema.tupleFieldPtr(block, src, struct_ptr, field_name_src, field_index);
19841 return sema.tupleFieldPtr(block, src, struct_ptr, field_name_src, field_index, initializing);
1983519842 }
1983619843
1983719844 const struct_obj = struct_ty.castTag(.@"struct").?.data;
......@@ -19840,7 +19847,7 @@ fn structFieldPtr(
1984019847 return sema.failWithBadStructFieldAccess(block, struct_obj, field_name_src, field_name);
1984119848 const field_index = @intCast(u32, field_index_big);
1984219849
19843 return sema.structFieldPtrByIndex(block, src, struct_ptr, field_index, field_name_src, struct_ty);
19850 return sema.structFieldPtrByIndex(block, src, struct_ptr, field_index, field_name_src, struct_ty, initializing);
1984419851}
1984519852
1984619853fn structFieldPtrByIndex(
......@@ -19851,9 +19858,10 @@ fn structFieldPtrByIndex(
1985119858 field_index: u32,
1985219859 field_src: LazySrcLoc,
1985319860 struct_ty: Type,
19861 initializing: bool,
1985419862) CompileError!Air.Inst.Ref {
1985519863 if (struct_ty.isAnonStruct()) {
19856 return sema.tupleFieldPtr(block, src, struct_ptr, field_src, field_index);
19864 return sema.tupleFieldPtr(block, src, struct_ptr, field_src, field_index, initializing);
1985719865 }
1985819866
1985919867 const struct_obj = struct_ty.castTag(.@"struct").?.data;
......@@ -20050,6 +20058,10 @@ fn tupleFieldValByIndex(
2005020058 return sema.addConstant(field_ty, field_values[field_index]);
2005120059 }
2005220060
20061 if (tuple_ty.structFieldValueComptime(field_index)) |default_val| {
20062 return sema.addConstant(field_ty, default_val);
20063 }
20064
2005320065 try sema.requireRuntimeBlock(block, src, null);
2005420066 return block.addStructFieldVal(tuple_byval, field_index, field_ty);
2005520067}
......@@ -20250,7 +20262,7 @@ fn elemPtr(
2025020262 // Tuple field access.
2025120263 const index_val = try sema.resolveConstValue(block, elem_index_src, elem_index, "tuple field access index must be comptime known");
2025220264 const index = @intCast(u32, index_val.toUnsignedInt(target));
20253 return sema.tupleFieldPtr(block, src, indexable_ptr, elem_index_src, index);
20265 return sema.tupleFieldPtr(block, src, indexable_ptr, elem_index_src, index, init);
2025420266 },
2025520267 else => unreachable,
2025620268 }
......@@ -20353,6 +20365,7 @@ fn tupleFieldPtr(
2035320365 tuple_ptr: Air.Inst.Ref,
2035420366 field_index_src: LazySrcLoc,
2035520367 field_index: u32,
20368 init: bool,
2035620369) CompileError!Air.Inst.Ref {
2035720370 const tuple_ptr_ty = sema.typeOf(tuple_ptr);
2035820371 const tuple_ty = tuple_ptr_ty.childType();
......@@ -20386,7 +20399,17 @@ fn tupleFieldPtr(
2038620399 );
2038720400 }
2038820401
20389 try sema.validateRuntimeElemAccess(block, field_index_src, field_ty, tuple_ty, tuple_ptr_src);
20402 if (tuple_ty.structFieldValueComptime(field_index)) |default_val| {
20403 const val = try Value.Tag.comptime_field_ptr.create(sema.arena, .{
20404 .field_ty = field_ty,
20405 .field_val = default_val,
20406 });
20407 return sema.addConstant(ptr_field_ty, val);
20408 }
20409
20410 if (!init) {
20411 try sema.validateRuntimeElemAccess(block, field_index_src, field_ty, tuple_ty, tuple_ptr_src);
20412 }
2039020413
2039120414 try sema.requireRuntimeBlock(block, tuple_ptr_src, null);
2039220415 return block.addStructFieldPtr(tuple_ptr, field_index, ptr_field_ty);
test/cases/compile_errors/invalid_store_to_comptime_field.zig+9
......@@ -13,9 +13,18 @@ pub export fn entry1() void {
1313 var s: S = .{};
1414 s.a = T{ .a = 2, .b = 2 };
1515}
16pub export fn entry2() void {
17 var list = .{ 1, 2, 3 };
18 var list2 = @TypeOf(list){ .@"0" = 1, .@"1" = 2, .@"2" = 3 };
19 var list3 = @TypeOf(list){ 1, 2, 4 };
20 _ = list2;
21 _ = list3;
22}
23
1624// error
1725// target=native
1826// backend=stage2
1927//
2028// :6:19: error: value stored in comptime field does not match the default value of the field
2129// :14:19: error: value stored in comptime field does not match the default value of the field
30// :19:38: error: value stored in comptime field does not match the default value of the field