Commit 14efbf5ed1731058a616582d81223e23f43af128 | zig

author	Veikka Tuominen <git@vexu.eu> 2023-10-15 21:28:36+03:00
committer	Veikka Tuominen <git@vexu.eu> 2023-10-16 14:00:18+03:00
log	14efbf5ed1731058a616582d81223e23f43af128
tree	6cf1d08c33dbe1874bc83016df90cc1fbcfd9ede
parent	78855bd21866b515018259a2194e036e4b3120df

Sema: fix missing check for tuple default initializers

Closes #17525

2 files changed, 50 insertions(+), 8 deletions(-)

src
- Sema.zig
test
- cases
  - compile_errors
    tuple_init_edge_cases.zig

src/Sema.zig+34-8

 @@ -19765,15 +19765,39 @@ fn zirArrayInit(
     const is_tuple = array_ty.zigTypeTag(mod) == .Struct;
     const sentinel_val = array_ty.sentinel(mod);
-    const resolved_args = try gpa.alloc(Air.Inst.Ref, args.len - 1 + @intFromBool(sentinel_val != null));
+    var root_msg: ?*Module.ErrorMsg = null;
+    errdefer if (root_msg) |msg| msg.destroy(sema.gpa);
+    const final_len = try sema.usizeCast(block, src, array_ty.arrayLenIncludingSentinel(mod));
+    const resolved_args = try gpa.alloc(Air.Inst.Ref, final_len);
     defer gpa.free(resolved_args);
-    for (args[1..], 0..) |arg, i| {
+    for (resolved_args, 0..) |*dest, i| {
+        // Less inits than needed.
+        if (i + 2 > args.len) if (is_tuple) {
+            const default_val = array_ty.structFieldDefaultValue(i, mod).toIntern();
+            if (default_val == .unreachable_value) {
+                const template = "missing tuple field with index {d}";
+                if (root_msg) |msg| {
+                    try sema.errNote(block, src, msg, template, .{i});
+                } else {
+                    root_msg = try sema.errMsg(block, src, template, .{i});
+                }
+            } else {
+                dest.* = Air.internedToRef(default_val);
+            }
+            continue;
+        } else {
+            dest.* = Air.internedToRef(sentinel_val.?.toIntern());
+            break;
+        };
+        const arg = args[i + 1];
         const resolved_arg = try sema.resolveInst(arg);
         const elem_ty = if (is_tuple)
             array_ty.structFieldType(i, mod)
         else
             array_ty.elemType2(mod);
-        resolved_args[i] = sema.coerce(block, elem_ty, resolved_arg, .unneeded) catch |err| switch (err) {
+        dest.* = sema.coerce(block, elem_ty, resolved_arg, .unneeded) catch |err| switch (err) {
             error.NeededSourceLocation => {
                 const decl = mod.declPtr(block.src_decl);
                 const elem_src = mod.initSrc(src.node_offset.x, decl, i);
 @@ -19783,7 +19807,7 @@ fn zirArrayInit(
             else => return err,
         };
         if (is_tuple) if (try array_ty.structFieldValueComptime(mod, i)) |field_val| {
-            const init_val = try sema.resolveMaybeUndefVal(resolved_args[i]) orelse {
+            const init_val = try sema.resolveMaybeUndefVal(dest.*) orelse {
                 const decl = mod.declPtr(block.src_decl);
                 const elem_src = mod.initSrc(src.node_offset.x, decl, i);
                 return sema.failWithNeededComptime(block, elem_src, .{
 @@ -19798,8 +19822,10 @@ fn zirArrayInit(
         };
     }
-    if (sentinel_val) |some| {
+    if (root_msg) |msg| {
-        resolved_args[resolved_args.len - 1] = Air.internedToRef(some.toIntern());
+        try sema.addDeclaredHereNote(msg, array_ty);
+        root_msg = null;
+        return sema.failWithOwnedErrorMsg(block, msg);
     }
     const opt_runtime_index: ?u32 = for (resolved_args, 0..) |arg, i| {
 @@ -19810,7 +19836,7 @@ fn zirArrayInit(
     const runtime_index = opt_runtime_index orelse {
         const elem_vals = try sema.arena.alloc(InternPool.Index, resolved_args.len);
         for (elem_vals, resolved_args, 0..) |*val, arg, i| {
-            const elem_ty = if (array_ty.zigTypeTag(mod) == .Struct)
+            const elem_ty = if (is_tuple)
                 array_ty.structFieldType(i, mod)
             else
                 array_ty.elemType2(mod);
 @@ -19845,7 +19871,7 @@ fn zirArrayInit(
         const alloc = try block.addTy(.alloc, alloc_ty);
         const base_ptr = try sema.optEuBasePtrInit(block, alloc, src);
-        if (array_ty.isTuple(mod)) {
+        if (is_tuple) {
             for (resolved_args, 0..) |arg, i| {
                 const elem_ptr_ty = try sema.ptrType(.{
                     .child = array_ty.structFieldType(i, mod).toIntern(),

test/cases/compile_errors/tuple_init_edge_cases.zig+16

...	@@ -45,6 +45,20 @@ pub export fn entry5() void {	...	@@ -45,6 +45,20 @@ pub export fn entry5() void {
45	var b = T{ .@"0" = 123, .@"2" = 123, .@"1" = 123 };	45	var b = T{ .@"0" = 123, .@"2" = 123, .@"1" = 123 };
46	_ = b;	46	_ = b;
47	}	47	}
		48	pub const Consideration = struct {
		49	curve: Curve,
		50	pub const Curve = union(enum) {
		51	logistic: Parameters,
		52
		53	pub const Parameters = struct { f32, f32, f32, f32 };
		54	};
		55	};
		56	pub export fn entry6() void {
		57	const cons: []Consideration = &.{
		58	.{ .curve = .{ .logistic = .{ -7, 1.0, 0 } } },
		59	};
		60	_ = cons;
		61	}
48		62
49	// error	63	// error
50	// backend=stage2	64	// backend=stage2
...	@@ -54,3 +68,5 @@ pub export fn entry5() void {	...	@@ -54,3 +68,5 @@ pub export fn entry5() void {
54	// :23:14: error: missing tuple field with index 1	68	// :23:14: error: missing tuple field with index 1
55	// :39:14: error: expected at most 2 tuple fields; found 3	69	// :39:14: error: expected at most 2 tuple fields; found 3
56	// :45:30: error: index '2' out of bounds of tuple 'struct{comptime comptime_int = 123, u32}'	70	// :45:30: error: index '2' out of bounds of tuple 'struct{comptime comptime_int = 123, u32}'
		71	// :58:37: error: missing tuple field with index 3
		72	// :53:32: note: struct declared here