authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2024-08-05 18:09:10-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-07 00:59:46-07:00
log304519da2747db452e365987c6ef65a3cb66eaf6
treebdbce55b99ba258abd312f72e662276cdabded04
parent00097c3bb81915913ce8afa1ae529cf8dd85f7a5

Make Type.intAbiAlignment match LLVM alignment for x86-windows target

During the LLVM 18 upgrade, two changes were made that changed `@alignOf(u64)` to 4 for the x86-windows target: - `Type.maxIntAlignment` was made to return 16 for x86 (200e06b). Before that commit, `maxIntAlignment` was 8 for windows/uefi and 4 for everything else - `Type.intAbiAlignment` was made to return 4 for 33...64 (7e1cba7 + e89d6fc). Before those commits, `intAbiAlignment` would return 8, since the maxIntAlignment for x86-windows was 8 (and for other targets, the `maxIntAlignment` of 4 would clamp the `intAbiAlignment` to 4) `src/codegen/llvm.zig` has its own alignment calculations that no longer match the values returned from the `Type` functions. For the x86-windows target, this loop: https://github.com/ziglang/zig/blob/ddcb7b1c11f88c4ae150b36807033060a469dcb5/src/codegen/llvm.zig#L558-L567 when the `size` is 64 will set `abi` and `pref` to 64 (meaning an align of 8 bytes), which doesn't match the `Type` alignment of 4. This commit makes `Type.intAbiAlignment` match the alignment calculated in `codegen/llvm.zig`. Fixes #20047 Fixes #20466 Fixes #20469

1 files changed, 5 insertions(+), 1 deletions(-)

src/Type.zig+5-1
...@@ -1563,7 +1563,11 @@ pub fn intAbiAlignment(bits: u16, target: Target, use_llvm: bool) Alignment {...@@ -1563,7 +1563,11 @@ pub fn intAbiAlignment(bits: u16, target: Target, use_llvm: bool) Alignment {
1563 0 => .none,1563 0 => .none,
1564 1...8 => .@"1",1564 1...8 => .@"1",
1565 9...16 => .@"2",1565 9...16 => .@"2",
1566 17...64 => .@"4",1566 17...32 => .@"4",
1567 33...64 => switch (target.os.tag) {
1568 .uefi, .windows => .@"8",
1569 else => .@"4",
1570 },
1567 else => .@"16",1571 else => .@"16",
1568 },1572 },
1569 .x86_64 => switch (bits) {1573 .x86_64 => switch (bits) {