aboutsummaryrefslogtreecommitdiff
path: root/src/Module.zig
diff options
context:
space:
mode:
authorMotiejus Jakštys <motiejus@uber.com>2023-06-09 16:02:18 -0700
committerAndrew Kelley <andrew@ziglang.org>2023-06-17 12:49:13 -0700
commitd41111d7ef531f6f55a19c56205d6d2f1134c224 (patch)
tree14d7b7764a64fa2d4d274c0726a1a587484c4999 /src/Module.zig
parent5baa05664e6dac0f473c8411f6e9d8e0f62555a9 (diff)
downloadzig-d41111d7ef531f6f55a19c56205d6d2f1134c224.tar.gz
zig-d41111d7ef531f6f55a19c56205d6d2f1134c224.zip
mem: rename align*Generic to mem.align*
Anecdote 1: The generic version is way more popular than the non-generic one in Zig codebase: git grep -w alignForward | wc -l 56 git grep -w alignForwardGeneric | wc -l 149 git grep -w alignBackward | wc -l 6 git grep -w alignBackwardGeneric | wc -l 15 Anecdote 2: In my project (turbonss) that does much arithmetic and alignment I exclusively use the Generic functions. Anecdote 3: we used only the Generic versions in the Macho Man's linker workshop.
Diffstat (limited to 'src/Module.zig')
-rw-r--r--src/Module.zig10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Module.zig b/src/Module.zig
index 8c5a86652d..8d9f9593dd 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -1293,7 +1293,7 @@ pub const Union = struct {
payload_align = @max(payload_align, 1);
if (!have_tag or !u.tag_ty.hasRuntimeBits(mod)) {
return .{
- .abi_size = std.mem.alignForwardGeneric(u64, payload_size, payload_align),
+ .abi_size = std.mem.alignForward(u64, payload_size, payload_align),
.abi_align = payload_align,
.most_aligned_field = most_aligned_field,
.most_aligned_field_size = most_aligned_field_size,
@@ -1314,18 +1314,18 @@ pub const Union = struct {
if (tag_align >= payload_align) {
// {Tag, Payload}
size += tag_size;
- size = std.mem.alignForwardGeneric(u64, size, payload_align);
+ size = std.mem.alignForward(u64, size, payload_align);
size += payload_size;
const prev_size = size;
- size = std.mem.alignForwardGeneric(u64, size, tag_align);
+ size = std.mem.alignForward(u64, size, tag_align);
padding = @intCast(u32, size - prev_size);
} else {
// {Payload, Tag}
size += payload_size;
- size = std.mem.alignForwardGeneric(u64, size, tag_align);
+ size = std.mem.alignForward(u64, size, tag_align);
size += tag_size;
const prev_size = size;
- size = std.mem.alignForwardGeneric(u64, size, payload_align);
+ size = std.mem.alignForward(u64, size, payload_align);
padding = @intCast(u32, size - prev_size);
}
return .{