zig

commit 35afa3fd8bdc140baf9d135711833e836de04d86 (tree)
parent 799a558e393d1c8286e8faec2bf8930138d8b1f4
Author: Veikka Tuominen <git@vexu.eu>
Date:   Fri,  4 Nov 2022 17:47:53 +0200

Sema: correct condition in validateArrayInit

Closes #13425

Diffstat:
M
src/Sema.zig
 | 
2
+-
M
test/behavior/array.zig
 | 
22
++++++++++++++++++++++

2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/Sema.zig b/src/Sema.zig
@@ -4380,7 +4380,7 @@ fn zirValidateArrayInit(
         var block_index = block.instructions.items.len - 1;
         while (block.instructions.items[block_index] != elem_ptr_air_inst) {
             if (block_index == 0) {
-                array_is_comptime = true;
+                array_is_comptime = false;
                 continue :outer;
             }
             block_index -= 1;
diff --git a/test/behavior/array.zig b/test/behavior/array.zig
@@ -574,3 +574,25 @@ test "tuple to array handles sentinel" {
     };
     try expect(S.b[0] == 1);
 }
+
+test "array init of container level array variable" {
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
+
+    const S = struct {
+        var pair: [2]usize = .{ 1, 2 };
+        noinline fn foo(x: usize, y: usize) void {
+            pair = [2]usize{ x, y };
+        }
+        noinline fn bar(x: usize, y: usize) void {
+            var tmp: [2]usize = .{ x, y };
+            pair = tmp;
+        }
+    };
+    try expectEqual([2]usize{ 1, 2 }, S.pair);
+    S.foo(3, 4);
+    try expectEqual([2]usize{ 3, 4 }, S.pair);
+    S.bar(5, 6);
+    try expectEqual([2]usize{ 5, 6 }, S.pair);
+}