Skip to content

Commit 6279a1d

Browse files
committed
std: align some function pointers
1 parent c34392b commit 6279a1d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/std/fmt.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,11 +2124,11 @@ test "pointer" {
21242124
try expectFmt("pointer: i32@deadbeef\n", "pointer: {*}\n", .{value});
21252125
}
21262126
{
2127-
const value = @intToPtr(*const fn () void, 0xdeadbeef);
2127+
const value = @intToPtr(*align(1) const fn () void, 0xdeadbeef);
21282128
try expectFmt("pointer: fn() void@deadbeef\n", "pointer: {}\n", .{value});
21292129
}
21302130
{
2131-
const value = @intToPtr(*const fn () void, 0xdeadbeef);
2131+
const value = @intToPtr(*align(1) const fn () void, 0xdeadbeef);
21322132
try expectFmt("pointer: fn() void@deadbeef\n", "pointer: {}\n", .{value});
21332133
}
21342134
}

lib/std/zig/c_translation.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ test "cast" {
136136
const FnPtr = if (@import("builtin").zig_backend == .stage1)
137137
?fn (*anyopaque) void
138138
else
139-
?*const fn (*anyopaque) void;
139+
?*align(1) const fn (*anyopaque) void;
140140
try testing.expect(cast(FnPtr, 0) == @intToPtr(FnPtr, @as(usize, 0)));
141141
try testing.expect(cast(FnPtr, foo) == @intToPtr(FnPtr, @bitCast(usize, @as(isize, -1))));
142142
}

0 commit comments

Comments
 (0)