mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 22:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "frontend: another packedStructFieldPtrInfo fix"

Browse Source 
This reverts commit 3ab845e028f464666856e4eaaeff2e6ab1b3da5d.
This commit is contained in:
Alex Rønne Petersen 2025-09-22 04:56:46 +02:00
parent d07b67a55c
commit 9694c83b95
No known key found for this signature in database
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Type.zig
View File

@ -3545,7 +3545,10 @@ pub fn packedStructFieldPtrInfo(struct_ty: Type, parent_ptr_ty: Type, field_idx:
parent_ptr_info.packed_offset.host_size,
parent_ptr_info.packed_offset.bit_offset + bit_offset,
} else .{
@intCast(struct_ty.abiSize(zcu)),
switch (zcu.comp.getZigBackend()) {
else => (running_bits + 7) / 8,
.stage2_x86_64 => @intCast(struct_ty.abiSize(zcu)),
},
bit_offset,
};

10
test/behavior/union.zig
View File

@ -1564,9 +1564,13 @@ test "packed union field pointer has correct alignment" {
const bp = &b.u.x;
const cp = &c.u.x;
comptime assert(@TypeOf(ap) == *align(4:2:@sizeOf(S)) u20);
comptime assert(@TypeOf(bp) == *align(1:2:@sizeOf(S)) u20);
comptime assert(@TypeOf(cp) == *align(64:2:@sizeOf(S)) u20);
const host_size = switch (builtin.zig_backend) {
else => comptime std.math.divCeil(comptime_int, @bitSizeOf(S), 8) catch unreachable,
.stage2_x86_64 => @sizeOf(S),
};
comptime assert(@TypeOf(ap) == *align(4:2:host_size) u20);
comptime assert(@TypeOf(bp) == *align(1:2:host_size) u20);
comptime assert(@TypeOf(cp) == *align(64:2:host_size) u20);
a.u = .{ .x = 123 };
b.u = .{ .x = 456 };