Commit 8a488fcdb8982201bca91ce2f0c6316d3e471186 | zig

author	Veikka Tuominen <git@vexu.eu> 2022-07-22 14:45:44+03:00
committer	Veikka Tuominen <git@vexu.eu> 2022-07-22 17:03:42+03:00
log	8a488fcdb8982201bca91ce2f0c6316d3e471186
tree	72e30edbb56e3de2a51930a93ff5710866ff1546
parent	47de73980e9dbbf85fee754b579273a9b7b57c53

Sema: validate empty array init

2 files changed, 47 insertions(+), 6 deletions(-)

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

src/Sema.zig+20-6

 @@ -3875,9 +3875,15 @@ fn zirValidateArrayInit(
     const array_len = array_ty.arrayLen();
     if (instrs.len != array_len) {
-        return sema.fail(block, init_src, "expected {d} array elements; found {d}", .{
+        if (array_ty.zigTypeTag() == .Array) {
-            array_len, instrs.len,
+            return sema.fail(block, init_src, "expected {d} array elements; found {d}", .{
-        });
+                array_len, instrs.len,
+            });
+        } else {
+            return sema.fail(block, init_src, "expected {d} vector elements; found {d}", .{
+                array_len, instrs.len,
+            });
+        }
     }
     if ((is_comptime or block.is_comptime) and
 @@ -14265,7 +14271,7 @@ fn zirStructInitEmpty(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileE
     switch (obj_ty.zigTypeTag()) {
         .Struct => return sema.structInitEmpty(block, obj_ty, src, src),
-        .Array => return arrayInitEmpty(sema, obj_ty),
+        .Array, .Vector => return sema.arrayInitEmpty(block, src, obj_ty),
         .Void => return sema.addConstant(obj_ty, Value.void),
         else => return sema.failWithArrayInitNotSupported(block, src, obj_ty),
     }
 @@ -14290,7 +14296,15 @@ fn structInitEmpty(
     return sema.finishStructInit(block, init_src, dest_src, field_inits, struct_ty, false);
 }
-fn arrayInitEmpty(sema: *Sema, obj_ty: Type) CompileError!Air.Inst.Ref {
+fn arrayInitEmpty(sema: *Sema, block: *Block, src: LazySrcLoc, obj_ty: Type) CompileError!Air.Inst.Ref {
+    const arr_len = obj_ty.arrayLen();
+    if (arr_len != 0) {
+        if (obj_ty.zigTypeTag() == .Array) {
+            return sema.fail(block, src, "expected {d} array elements; found 0", .{arr_len});
+        } else {
+            return sema.fail(block, src, "expected {d} vector elements; found 0", .{arr_len});
+        }
+    }
     if (obj_ty.sentinel()) |sentinel| {
         const val = try Value.Tag.empty_array_sentinel.create(sema.arena, sentinel);
         return sema.addConstant(obj_ty, val);
 @@ -20978,7 +20992,7 @@ fn coerceExtra(
             .Vector => return sema.coerceArrayLike(block, dest_ty, dest_ty_src, inst, inst_src),
             .Struct => {
                 if (inst == .empty_struct) {
-                    return arrayInitEmpty(sema, dest_ty);
+                    return sema.arrayInitEmpty(block, inst_src, dest_ty);
                 }
                 if (inst_ty.isTuple()) {
                     return sema.coerceTupleToArray(block, dest_ty, dest_ty_src, inst, inst_src);

test/cases/compile_errors/array_init_invalid_elem_count.zig created+27

...	@@ -0,0 +1,27 @@
1	const V = @Vector(8, u8);
2	const A = [8]u8;
3	comptime {
4	var v: V = V{1};
5	_ = v;
6	}
7	comptime {
8	var v: V = V{};
9	_ = v;
10	}
11	comptime {
12	var a: A = A{1};
13	_ = a;
14	}
15	comptime {
16	var a: A = A{};
17	_ = a;
18	}
19
20	// error
21	// backend=stage2
22	// target=native
23	//
24	// :4:17: error: expected 8 vector elements; found 1
25	// :8:17: error: expected 8 vector elements; found 0
26	// :12:17: error: expected 8 array elements; found 1
27	// :16:17: error: expected 8 array elements; found 0