Commit fb523c6283be546369250b9172aad040d44f42dd | zig

author	Casey Banner <kcbanner@gmail.com> 2023-10-24 01:44:44-04:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2023-10-31 01:35:58+00:00
log	fb523c6283be546369250b9172aad040d44f42dd
tree	cc0c2a6462ca1bcf91f5994f45e2e301e51318d1
parent	4d044ee7e0b1ca61b8f2205f318449780ae23bd2

sema: when guessing union alignment, save the result and check if the guess was correct

3 files changed, 37 insertions(+), 6 deletions(-)

src
- InternPool.zig
- Sema.zig
test
- behavior
  - union.zig

src/InternPool.zig+6-5

 @@ -690,13 +690,13 @@ pub const Key = union(enum) {
         /// The returned pointer expires with any addition to the `InternPool`.
         pub fn size(self: @This(), ip: *InternPool) *u32 {
             const size_field_index = std.meta.fieldIndex(Tag.TypeUnion, "size").?;
-            return @ptrCast(&ip.extra.items[self.extra_index + size_field_index]);
+            return &ip.extra.items[self.extra_index + size_field_index];
         }
         /// The returned pointer expires with any addition to the `InternPool`.
         pub fn padding(self: @This(), ip: *InternPool) *u32 {
             const padding_field_index = std.meta.fieldIndex(Tag.TypeUnion, "padding").?;
-            return @ptrCast(&ip.extra.items[self.extra_index + padding_field_index]);
+            return &ip.extra.items[self.extra_index + padding_field_index];
         }
         pub fn haveFieldTypes(self: @This(), ip: *const InternPool) bool {
 @@ -2965,9 +2965,9 @@ pub const Tag = enum(u8) {
     /// 1. field align: Alignment for each field; declaration order
     pub const TypeUnion = struct {
         flags: Flags,
-        // Only valid after .have_layout
+        /// Only valid after .have_layout
         size: u32,
-        // Only valid after .have_layout
+        /// Only valid after .have_layout
         padding: u32,
         decl: Module.Decl.Index,
         namespace: Module.Namespace.Index,
 @@ -2983,8 +2983,9 @@ pub const Tag = enum(u8) {
             status: UnionType.Status,
             requires_comptime: RequiresComptime,
             assumed_runtime_bits: bool,
+            assumed_pointer_aligned: bool,
             alignment: Alignment,
-            _: u15 = 0,
+            _: u14 = 0,
         };
     };

src/Sema.zig+18-1

 @@ -3200,6 +3200,7 @@ fn zirUnionDecl(
                 .any_aligned_fields = small.any_aligned_fields,
                 .requires_comptime = .unknown,
                 .assumed_runtime_bits = false,
+                .assumed_pointer_aligned = false,
                 .alignment = .none,
             },
             .decl = new_decl_index,
 @@ -20989,6 +20990,7 @@ fn zirReify(
                     .any_aligned_fields = any_aligned_fields,
                     .requires_comptime = .unknown,
                     .assumed_runtime_bits = false,
+                    .assumed_pointer_aligned = false,
                     .alignment = .none,
                 },
                 .field_types = union_fields.items(.type),
 @@ -34940,7 +34942,10 @@ pub fn resolveUnionAlignment(
         // We'll guess "pointer-aligned", if the union has an
         // underaligned pointer field then some allocations
         // might require explicit alignment.
-        return Alignment.fromByteUnits(@divExact(target.ptrBitWidth(), 8));
+        union_type.flagsPtr(ip).assumed_pointer_aligned = true;
+        const result = Alignment.fromByteUnits(@divExact(target.ptrBitWidth(), 8));
+        union_type.flagsPtr(ip).alignment = result;
+        return result;
     }
     try sema.resolveTypeFieldsUnion(ty, union_type);
 @@ -35064,6 +35069,18 @@ fn resolveUnionLayout(sema: *Sema, ty: Type) CompileError!void {
         );
         return sema.failWithOwnedErrorMsg(null, msg);
     }
+    if (union_obj.flagsPtr(ip).assumed_pointer_aligned and
+        alignment.compareStrict(.neq, Alignment.fromByteUnits(@divExact(mod.getTarget().ptrBitWidth(), 8))))
+    {
+        const msg = try Module.ErrorMsg.create(
+            sema.gpa,
+            mod.declPtr(union_obj.decl).srcLoc(mod),
+            "union layout depends on being pointer aligned",
+            .{},
+        );
+        return sema.failWithOwnedErrorMsg(null, msg);
+    }
 }
 /// Returns `error.AnalysisFail` if any of the types (recursively) failed to

test/behavior/union.zig+13

...	@@ -1868,3 +1868,16 @@ test "reinterpret packed union inside packed struct" {	...	@@ -1868,3 +1868,16 @@ test "reinterpret packed union inside packed struct" {
1868	if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO	1868	if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
1869	try S.doTheTest();	1869	try S.doTheTest();
1870	}	1870	}
		1871
		1872	test "union field is a pointer to an aligned version of itself" {
		1873	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
		1874	if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
		1875
		1876	const E = union {
		1877	next: *align(1) @This(),
		1878	};
		1879	var e: E = undefined;
		1880	e = .{ .next = &e };
		1881
		1882	try expect(&e == e.next);
		1883	}