Merge pull request #14403 from Vexu/fixes

Misc fixes

9 files changed, 91 insertions, 14 deletions

diff --git a/test/behavior.zig b/test/behavior.zig
index 51a261cc5c..4f8ad67203 100644
--- a/test/behavior.zig
+++ b/test/behavior.zig
@@ -106,7 +106,6 @@ test {
     _ = @import("behavior/bugs/12430.zig");
     _ = @import("behavior/bugs/12450.zig");
     _ = @import("behavior/bugs/12486.zig");
-    _ = @import("behavior/bugs/12488.zig");
     _ = @import("behavior/bugs/12498.zig");
     _ = @import("behavior/bugs/12551.zig");
     _ = @import("behavior/bugs/12571.zig");
diff --git a/test/behavior/bugs/12488.zig b/test/behavior/bugs/12488.zig
deleted file mode 100644
index b05197b24f..0000000000
--- a/test/behavior/bugs/12488.zig
+++ /dev/null
@@ -1,13 +0,0 @@
-const expect = @import("std").testing.expect;
-
-const A = struct {
-    a: u32,
-};
-
-fn foo(comptime a: anytype) !void {
-    try expect(a[0][0] == @sizeOf(A));
-}
-
-test {
-    try foo(.{[_]usize{@sizeOf(A)}});
-}
diff --git a/test/behavior/fn.zig b/test/behavior/fn.zig
index 8dca94a656..d5f959e507 100644
--- a/test/behavior/fn.zig
+++ b/test/behavior/fn.zig
@@ -517,3 +517,26 @@ test "peer type resolution of inferred error set with non-void payload" {
     };
     try expect(try S.openDataFile(.read) == 1);
 }
+
+test "lazy values passed to anytype parameter" {
+    const A = struct {
+        a: u32,
+        fn foo(comptime a: anytype) !void {
+            try expect(a[0][0] == @sizeOf(@This()));
+        }
+    };
+    try A.foo(.{[_]usize{@sizeOf(A)}});
+
+    const B = struct {
+        fn foo(comptime a: anytype) !void {
+            try expect(a.x == 0);
+        }
+    };
+    try B.foo(.{ .x = @sizeOf(B) });
+
+    const C = struct {};
+    try expect(@truncate(u32, @sizeOf(C)) == 0);
+
+    const D = struct {};
+    try expect(@sizeOf(D) << 1 == 0);
+}
diff --git a/test/behavior/pointers.zig b/test/behavior/pointers.zig
index c8879453ad..d93e991889 100644
--- a/test/behavior/pointers.zig
+++ b/test/behavior/pointers.zig
@@ -532,3 +532,18 @@ test "pointer alignment and element type include call expression" {
     };
     try expect(@alignOf(S.P) > 0);
 }
+
+test "pointer to array has explicit alignment" {
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
+
+    const S = struct {
+        const Base = extern struct { a: u8 };
+        const Base2 = extern struct { a: u8 };
+        fn func(ptr: *[4]Base) *align(1) [4]Base2 {
+            return @alignCast(1, @ptrCast(*[4]Base2, ptr));
+        }
+    };
+    var bases = [_]S.Base{.{ .a = 2 }} ** 4;
+    const casted = S.func(&bases);
+    try expect(casted[0].a == 2);
+}
diff --git a/test/behavior/struct.zig b/test/behavior/struct.zig
index a32a0ed495..ed3e1ce88f 100644
--- a/test/behavior/struct.zig
+++ b/test/behavior/struct.zig
@@ -1573,3 +1573,8 @@ test "struct fields get automatically reordered" {
     };
     try expect(@sizeOf(S1) == @sizeOf(S2));
 }
+
+test "directly initiating tuple like struct" {
+    const a = struct { u8 }{8};
+    try expect(a[0] == 8);
+}
diff --git a/test/behavior/vector.zig b/test/behavior/vector.zig
index ba3d98ee56..8bcae5fefc 100644
--- a/test/behavior/vector.zig
+++ b/test/behavior/vector.zig
@@ -1286,3 +1286,14 @@ test "store to vector in slice" {
     s[i] = s[0];
     try expectEqual(v[1], v[0]);
 }
+
+test "addition of vectors represented as strings" {
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
+
+    const V = @Vector(3, u8);
+    const foo: V = "foo".*;
+    const bar: V = @typeName(u32).*;
+    try expectEqual(V{ 219, 162, 161 }, foo + bar);
+}
diff --git a/test/c_abi/cfuncs.c b/test/c_abi/cfuncs.c
index bd249335c5..bdf58db335 100644
--- a/test/c_abi/cfuncs.c
+++ b/test/c_abi/cfuncs.c
@@ -1015,3 +1015,15 @@ void __attribute__((stdcall)) stdcall_big_union(union BigUnion x) {
     assert_or_panic(x.a.c == 3);
     assert_or_panic(x.a.d == 4);
 }
+
+#ifdef __x86_64__
+struct ByRef __attribute__((ms_abi)) c_explict_win64(struct ByRef in) {
+    in.val = 42;
+    return in;
+}
+
+struct ByRef __attribute__((sysv_abi)) c_explict_sys_v(struct ByRef in) {
+    in.val = 42;
+    return in;
+}
+#endif
diff --git a/test/c_abi/main.zig b/test/c_abi/main.zig
index 358e15a929..db76697473 100644
--- a/test/c_abi/main.zig
+++ b/test/c_abi/main.zig
@@ -1190,3 +1190,19 @@ test "Stdcall ABI big union" {
     };
     stdcall_big_union(x);
 }
+
+extern fn c_explict_win64(ByRef) callconv(.Win64) ByRef;
+test "explicit SysV calling convention" {
+    if (builtin.cpu.arch != .x86_64) return error.SkipZigTest;
+
+    const res = c_explict_win64(.{ .val = 1, .arr = undefined });
+    try expect(res.val == 42);
+}
+
+extern fn c_explict_sys_v(ByRef) callconv(.SysV) ByRef;
+test "explicit Win64 calling convention" {
+    if (builtin.cpu.arch != .x86_64) return error.SkipZigTest;
+
+    const res = c_explict_sys_v(.{ .val = 1, .arr = undefined });
+    try expect(res.val == 42);
+}
diff --git a/test/cases/compile_errors/bad_member_access_on_tuple.zig b/test/cases/compile_errors/bad_member_access_on_tuple.zig
new file mode 100644
index 0000000000..0f91655fc0
--- /dev/null
+++ b/test/cases/compile_errors/bad_member_access_on_tuple.zig
@@ -0,0 +1,9 @@
+comptime {
+    _ = @TypeOf(.{}).is_optional;
+}
+
+// error
+// backend=stage2
+// target=native
+//
+// :2:21: error: struct '@TypeOf(.{})' has no member named 'is_optional'