authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-11-04 13:18:13+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-11-23 18:44:07-05:00
logaef5c756027c11885a3ae7f55061cdbd3e3bc0b9
treeb7f207a62ba14f4ce3b193b167a8b6db8dc420de
parent2742ab4b5a6ebb317e19c89f1ebcb8b9a857a3c3

compiler: Disallow align(0) everywhere in the language.

Thus leaving the design space for this alignment value open, e.g. for packing.

3 files changed, 57 insertions(+), 16 deletions(-)

src/Sema.zig+4-15
...@@ -2584,18 +2584,7 @@ fn validateAlign(...@@ -2584,18 +2584,7 @@ fn validateAlign(
2584 src: LazySrcLoc,2584 src: LazySrcLoc,
2585 alignment: u64,2585 alignment: u64,
2586) !Alignment {2586) !Alignment {
2587 const result = try validateAlignAllowZero(sema, block, src, alignment);2587 if (alignment == 0) return sema.fail(block, src, "alignment must be >= 1", .{});
2588 if (result == .none) return sema.fail(block, src, "alignment must be >= 1", .{});
2589 return result;
2590}
2591
2592fn validateAlignAllowZero(
2593 sema: *Sema,
2594 block: *Block,
2595 src: LazySrcLoc,
2596 alignment: u64,
2597) !Alignment {
2598 if (alignment == 0) return .none;
2599 if (!std.math.isPowerOfTwo(alignment)) {2588 if (!std.math.isPowerOfTwo(alignment)) {
2600 return sema.fail(block, src, "alignment value '{d}' is not a power of two", .{2589 return sema.fail(block, src, "alignment value '{d}' is not a power of two", .{
2601 alignment,2590 alignment,
...@@ -20496,7 +20485,7 @@ fn zirPtrType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air...@@ -20496,7 +20485,7 @@ fn zirPtrType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air
20496 else => {},20485 else => {},
20497 }20486 }
20498 const align_bytes = (try val.getUnsignedIntSema(pt)).?;20487 const align_bytes = (try val.getUnsignedIntSema(pt)).?;
20499 break :blk try sema.validateAlignAllowZero(block, align_src, align_bytes);20488 break :blk try sema.validateAlign(block, align_src, align_bytes);
20500 } else .none;20489 } else .none;
2050120490
20502 const address_space: std.builtin.AddressSpace = if (inst_data.flags.has_addrspace) blk: {20491 const address_space: std.builtin.AddressSpace = if (inst_data.flags.has_addrspace) blk: {
...@@ -26858,7 +26847,7 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A...@@ -26858,7 +26847,7 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
26858 if (val.isGenericPoison()) {26847 if (val.isGenericPoison()) {
26859 break :blk null;26848 break :blk null;
26860 }26849 }
26861 break :blk try sema.validateAlignAllowZero(block, align_src, try val.toUnsignedIntSema(pt));26850 break :blk try sema.validateAlign(block, align_src, try val.toUnsignedIntSema(pt));
26862 } else if (extra.data.bits.has_align_ref) blk: {26851 } else if (extra.data.bits.has_align_ref) blk: {
26863 const align_ref: Zir.Inst.Ref = @enumFromInt(sema.code.extra[extra_index]);26852 const align_ref: Zir.Inst.Ref = @enumFromInt(sema.code.extra[extra_index]);
26864 extra_index += 1;26853 extra_index += 1;
...@@ -26876,7 +26865,7 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A...@@ -26876,7 +26865,7 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
26876 error.GenericPoison => break :blk null,26865 error.GenericPoison => break :blk null,
26877 else => |e| return e,26866 else => |e| return e,
26878 };26867 };
26879 break :blk try sema.validateAlignAllowZero(block, align_src, try align_val.toUnsignedIntSema(pt));26868 break :blk try sema.validateAlign(block, align_src, try align_val.toUnsignedIntSema(pt));
26880 } else .none;26869 } else .none;
2688126870
26882 const @"addrspace": ?std.builtin.AddressSpace = if (extra.data.bits.has_addrspace_body) blk: {26871 const @"addrspace": ?std.builtin.AddressSpace = if (extra.data.bits.has_addrspace_body) blk: {
test/cases/compile_errors/align_zero.zig created+52
...@@ -0,0 +1,52 @@
1pub var global_var: i32 align(0) = undefined;
2
3pub export fn a() void {
4 _ = &global_var;
5}
6
7pub extern var extern_var: i32 align(0);
8
9pub export fn b() void {
10 _ = &extern_var;
11}
12
13pub export fn c() align(0) void {}
14
15pub export fn d() void {
16 _ = *align(0) fn () i32;
17}
18
19pub export fn e() void {
20 var local_var: i32 align(0) = undefined;
21 _ = &local_var;
22}
23
24pub export fn f() void {
25 _ = *align(0) i32;
26}
27
28pub export fn g() void {
29 _ = []align(0) i32;
30}
31
32pub export fn h() void {
33 _ = struct { field: i32 align(0) };
34}
35
36pub export fn i() void {
37 _ = union { field: i32 align(0) };
38}
39
40// error
41// backend=stage2
42// target=native
43//
44// :1:31: error: alignment must be >= 1
45// :7:38: error: alignment must be >= 1
46// :13:25: error: alignment must be >= 1
47// :16:16: error: alignment must be >= 1
48// :20:30: error: alignment must be >= 1
49// :25:16: error: alignment must be >= 1
50// :29:17: error: alignment must be >= 1
51// :33:35: error: alignment must be >= 1
52// :37:34: error: alignment must be >= 1
test/cases/compile_errors/function_alignment_on_unsupported_target.zig+1-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1export fn entry() align(0) void {}1export fn entry() align(64) void {}
22
3// error3// error
4// backend=stage24// backend=stage2