mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "frontend: another packedStructFieldPtrInfo fix"

Browse Source 
This reverts commit dedccecda944f88a5278c12c24ffbea46126de63.
This commit is contained in:
mlugg 2025-09-18 20:24:31 +01:00 committed by Andrew Kelley
parent f81a721e41
commit 20925f2957
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

@ -3540,7 +3540,10 @@ pub fn packedStructFieldPtrInfo(
parent_ptr_info.packed_offset.host_size, parent_ptr_info.packed_offset.host_size,
parent_ptr_info.packed_offset.bit_offset + bit_offset, parent_ptr_info.packed_offset.bit_offset + bit_offset,
} else .{ } 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, bit_offset,
}; };

10
test/behavior/union.zig
View File

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