authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-05 21:54:24-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-05 21:54:24-07:00
log6279a1d684193ffbe34b384250cdbb5ab4a328f9
treefab06b63267f1b8d05aa59080fda0a536c469617
parentc34392b24e5ef69f34dd73f08d9e1e9add1385cd

std: align some function pointers

2 files changed, 3 insertions(+), 3 deletions(-)

lib/std/fmt.zig+2-2
......@@ -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+1-1
......@@ -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}