Commit f49dff64c64baf8be48cc987b4ed61712afabc3d | zig

Closes #12566

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

src/Sema.zig+13-13

 @@ -4071,6 +4071,19 @@ fn zirValidateArrayInit(
         // Determine whether the value stored to this pointer is comptime-known.
+        if (array_ty.isTuple()) {
+            if (array_ty.structFieldValueComptime(i)) |opv| {
+                element_vals[i] = opv;
+                continue;
+            }
+        } else {
+            // Array has one possible value, so value is always comptime-known
+            if (opt_opv) |opv| {
+                element_vals[i] = opv;
+                continue;
+            }
+        }
         const elem_ptr_air_ref = sema.inst_map.get(elem_ptr).?;
         const elem_ptr_air_inst = Air.refToIndex(elem_ptr_air_ref).?;
         // Find the block index of the elem_ptr so that we can look at the next
 @@ -4087,19 +4100,6 @@ fn zirValidateArrayInit(
         }
         first_block_index = @minimum(first_block_index, block_index);
-        if (array_ty.isTuple()) {
-            if (array_ty.structFieldValueComptime(i)) |opv| {
-                element_vals[i] = opv;
-                continue;
-            }
-        } else {
-            // Array has one possible value, so value is always comptime-known
-            if (opt_opv) |opv| {
-                element_vals[i] = opv;
-                continue;
-            }
-        }
         // If the next instructon is a store with a comptime operand, this element
         // is comptime.
         const next_air_inst = block.instructions.items[block_index + 1];

test/behavior/tuple.zig+11

...	@@ -290,3 +290,14 @@ test "coerce tuple to tuple" {	...	@@ -290,3 +290,14 @@ test "coerce tuple to tuple" {
290	};	290	};
291	try S.foo(.{123});	291	try S.foo(.{123});
292	}	292	}
		293
		294	test "tuple type with void field" {
		295	if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
		296	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
		297	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
		298	if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
		299
		300	const T = std.meta.Tuple(&[_]type{void});
		301	const x = T{{}};
		302	try expect(@TypeOf(x[0]) == void);
		303	}