Commit f803761e13a65ccbc6a5508f2dc2d7723b010dab | zig

author	John Schmidt <john.schmidt.h@gmail.com> 2024-02-11 22:55:13+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-02-26 17:03:20-08:00
log	f803761e13a65ccbc6a5508f2dc2d7723b010dab
tree	a913a11999ae074ffb5e59bfb13c973f13f659b2
parent	7a045ede7ca26338dc553e1a0113d1de4daf1b95

Fix tuple default values

- Add default values to the list of comptime-known elements in
  `zirValidatePtrArrayInit`
- In `structFieldValueComptime`, only assert `haveFieldInits` if we
  enter the`fieldIsComptime` branch (otherwise they are not needed).

3 files changed, 28 insertions(+), 9 deletions(-)

src
- Sema.zig
- type.zig
test
- behavior
  - tuple.zig

src/Sema.zig+13-8

 @@ -5043,22 +5043,33 @@ fn zirValidatePtrArrayInit(
     const array_ty = sema.typeOf(array_ptr).childType(mod).optEuBaseType(mod);
     const array_len = array_ty.arrayLen(mod);
+    // Collect the comptime element values in case the array literal ends up
+    // being comptime-known.
+    const element_vals = try sema.arena.alloc(
+        InternPool.Index,
+        try sema.usizeCast(block, init_src, array_len),
+    );
     if (instrs.len != array_len) switch (array_ty.zigTypeTag(mod)) {
         .Struct => {
             var root_msg: ?*Module.ErrorMsg = null;
             errdefer if (root_msg) |msg| msg.destroy(sema.gpa);
+            try sema.resolveStructFieldInits(array_ty);
             var i = instrs.len;
             while (i < array_len) : (i += 1) {
-                const default_val = array_ty.structFieldDefaultValue(i, mod);
+                const default_val = array_ty.structFieldDefaultValue(i, mod).toIntern();
-                if (default_val.toIntern() == .unreachable_value) {
+                if (default_val == .unreachable_value) {
                     const template = "missing tuple field with index {d}";
                     if (root_msg) |msg| {
                         try sema.errNote(block, init_src, msg, template, .{i});
                     } else {
                         root_msg = try sema.errMsg(block, init_src, template, .{i});
                     }
+                    continue;
                 }
+                element_vals[i] = default_val;
             }
             if (root_msg) |msg| {
 @@ -5105,12 +5116,6 @@ fn zirValidatePtrArrayInit(
     var array_is_comptime = true;
     var first_block_index = block.instructions.items.len;
-    // Collect the comptime element values in case the array literal ends up
-    // being comptime-known.
-    const element_vals = try sema.arena.alloc(
-        InternPool.Index,
-        try sema.usizeCast(block, init_src, array_len),
-    );
     const air_tags = sema.air_instructions.items(.tag);
     const air_datas = sema.air_instructions.items(.data);

src/type.zig+1-1

 @@ -3073,8 +3073,8 @@ pub const Type = struct {
         const ip = &mod.intern_pool;
         switch (ip.indexToKey(ty.toIntern())) {
             .struct_type => |struct_type| {
-                assert(struct_type.haveFieldInits(ip));
                 if (struct_type.fieldIsComptime(ip, index)) {
+                    assert(struct_type.haveFieldInits(ip));
                     return Value.fromInterned(struct_type.field_inits.get(ip)[index]);
                 } else {
                     return Type.fromInterned(struct_type.field_types.get(ip)[index]).onePossibleValue(mod);

test/behavior/tuple.zig+14

...	@@ -560,3 +560,17 @@ test "comptime fields in tuple can be initialized" {	...	@@ -560,3 +560,17 @@ test "comptime fields in tuple can be initialized" {
560	var a: T = .{ 0, 0 };	560	var a: T = .{ 0, 0 };
561	_ = &a;	561	_ = &a;
562	}	562	}
		563
		564	test "tuple default values" {
		565	const T = struct {
		566	usize,
		567	usize = 123,
		568	usize = 456,
		569	};
		570
		571	const t: T = .{1};
		572
		573	try expectEqual(1, t[0]);
		574	try expectEqual(123, t[1]);
		575	try expectEqual(456, t[2]);
		576	}