authorgravatar for goon.pri.low@gmail.comKendall Condon <goon.pri.low@gmail.com> 2025-06-27 13:42:09-04:00
committergravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2025-07-30 09:56:38+01:00
logb0d6c227d3fe972844de5660d7398a721f2ba234
tree96c33e27ca7d111986419e133ae62ca7d86e13a0
parentf7dc9b50ab1ebc9714b1fa1b9929ae5f778fed69

Sema: catch error sets in atomic operations

also fix the struct test

2 files changed, 21 insertions(+), 3 deletions(-)

src/Zcu.zig+6-1
...@@ -3859,7 +3859,12 @@ pub fn atomicPtrAlignment(...@@ -3859,7 +3859,12 @@ pub fn atomicPtrAlignment(
3859 }3859 }
3860 return .none;3860 return .none;
3861 }3861 }
3862 if (ty.isAbiInt(zcu)) {3862 if (switch (ty.zigTypeTag(zcu)) {
3863 .int, .@"enum" => true,
3864 .@"struct" => ty.containerLayout(zcu) == .@"packed",
3865 else => false,
3866 }) {
3867 assert(ty.isAbiInt(zcu));
3863 const bit_count = ty.intInfo(zcu).bits;3868 const bit_count = ty.intInfo(zcu).bits;
3864 if (bit_count > max_atomic_bits) {3869 if (bit_count > max_atomic_bits) {
3865 diags.* = .{3870 diags.* = .{
test/cases/compile_errors/atomics_with_invalid_type.zig+15-2
...@@ -5,14 +5,27 @@ export fn float() void {...@@ -5,14 +5,27 @@ export fn float() void {
55
6const NormalStruct = struct { x: u32 };6const NormalStruct = struct { x: u32 };
7export fn normalStruct() void {7export fn normalStruct() void {
8 var x: NormalStruct = 0;8 var x: NormalStruct = .{ .x = 0 };
9 _ = @cmpxchgWeak(NormalStruct, &x, .{ .x = 1 }, .{ .x = 2 }, .seq_cst, .seq_cst);9 _ = @cmpxchgWeak(NormalStruct, &x, .{ .x = 1 }, .{ .x = 2 }, .seq_cst, .seq_cst);
10}10}
1111
12export fn anyError() void {
13 var x: anyerror = error.A;
14 _ = @cmpxchgWeak(anyerror, &x, error.A, error.B, .seq_cst, .seq_cst);
15}
16
17const ErrorSet = error{ A, B };
18export fn errorSet() void {
19 var x: ErrorSet = error.A;
20 _ = @cmpxchgWeak(ErrorSet, &x, error.A, error.B, .seq_cst, .seq_cst);
21}
22
12// error23// error
13// backend=stage224// backend=stage2
14// target=native25// target=native
15//26//
16// :3:22: error: expected bool, integer, enum, packed struct, or pointer type; found 'f32'27// :3:22: error: expected bool, integer, enum, packed struct, or pointer type; found 'f32'
17// :8:27: error: expected type 'tmp.NormalStruct', found 'comptime_int'28// :9:22: error: expected bool, integer, float, enum, packed struct, or pointer type; found 'tmp.NormalStruct'
18// :6:22: note: struct declared here29// :6:22: note: struct declared here
30// :14:22: error: expected bool, integer, float, enum, packed struct, or pointer type; found 'anyerror'
31// :20:22: error: expected bool, integer, float, enum, packed struct, or pointer type; found 'error{A,B}'