From f4b067743f2ad25a1153153e3a89e0fe92837ea7 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 27 Dec 2022 13:46:57 -0700 Subject: [PATCH 1/3] add behavior test for optional error union return type closes #1814 --- test/behavior/error.zig | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/behavior/error.zig b/test/behavior/error.zig index fdf9091fe8..459799f5f6 100644 --- a/test/behavior/error.zig +++ b/test/behavior/error.zig @@ -889,3 +889,16 @@ test "field access of anyerror results in smaller error set" { try expect(@TypeOf(E2.A) == E2); try expect(@TypeOf(@field(anyerror, "NotFound")) == error{NotFound}); } + +test "optional error union return type" { + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO + + const S = struct { + fn foo() ?anyerror!u32 { + var x: u32 = 1234; + return @as(anyerror!u32, x); + } + }; + try expect(1234 == try S.foo().?); +} From 6e9fbc83ca2cfe145d73a102e4175e49524d0dee Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 27 Dec 2022 14:44:04 -0700 Subject: [PATCH 2/3] add behavior test for comptime pointer casting comptime `@ptrCast` a subset of an array, then write through it closes #2444 --- test/behavior/array.zig | 1 + test/behavior/bugs/12571.zig | 1 + test/behavior/ptrcast.zig | 13 +++++++++++++ 3 files changed, 15 insertions(+) diff --git a/test/behavior/array.zig b/test/behavior/array.zig index 2f426bf5bf..52a4d7512a 100644 --- a/test/behavior/array.zig +++ b/test/behavior/array.zig @@ -61,6 +61,7 @@ test "array concat with undefined" { } test "array concat with tuple" { + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO diff --git a/test/behavior/bugs/12571.zig b/test/behavior/bugs/12571.zig index 4338051b18..ace1e93b3f 100644 --- a/test/behavior/bugs/12571.zig +++ b/test/behavior/bugs/12571.zig @@ -14,6 +14,7 @@ const Entry = packed struct { test { 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 frame = Frame{ .num = 0x7FDE }; var entry = Entry{ .other = 0, .frame = .{ .num = 0xFFFFF } }; diff --git a/test/behavior/ptrcast.zig b/test/behavior/ptrcast.zig index e2d33f898c..0a983f82c6 100644 --- a/test/behavior/ptrcast.zig +++ b/test/behavior/ptrcast.zig @@ -257,3 +257,16 @@ test "@ptrCast slice to slice" { try expect(buf[1] == 42); try expect(alias.len == 4); } + +test "comptime @ptrCast a subset of an array, then write through it" { + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO + + comptime { + var buff: [16]u8 align(4) = undefined; + const len_bytes = @ptrCast(*u32, &buff); + len_bytes.* = 16; + std.mem.copy(u8, buff[4..], "abcdef"); + } +} From 357235d9de9feb9d5b29d40574bce10e23382c79 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 27 Dec 2022 15:19:00 -0700 Subject: [PATCH 3/3] add behavior test for ptrcasted function pointers See #2626. The runtime case is solved but comptime is not. --- test/behavior/fn.zig | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/behavior/fn.zig b/test/behavior/fn.zig index d33d1aad71..e306fdc207 100644 --- a/test/behavior/fn.zig +++ b/test/behavior/fn.zig @@ -457,3 +457,30 @@ test "method call with optional and error union first param" { try s.opt(); try s.errUnion(); } + +test "using @ptrCast on function pointers" { + if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO + + const S = struct { + const A = struct { data: [4]u8 }; + + fn at(arr: *const A, index: usize) *const u8 { + return &arr.data[index]; + } + + fn run() !void { + const a = A{ .data = "abcd".* }; + const casted_fn = @ptrCast(*const fn (*const anyopaque, usize) *const u8, &at); + const casted_impl = @ptrCast(*const anyopaque, &a); + const ptr = casted_fn(casted_impl, 2); + try expect(ptr.* == 'c'); + } + }; + + try S.run(); + // https://github.com/ziglang/zig/issues/2626 + // try comptime S.run(); +}