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" {...@@ -2124,11 +2124,11 @@ test "pointer" {
2124 try expectFmt("pointer: i32@deadbeef\n", "pointer: {*}\n", .{value});2124 try expectFmt("pointer: i32@deadbeef\n", "pointer: {*}\n", .{value});
2125 }2125 }
2126 {2126 {
2127 const value = @intToPtr(*const fn () void, 0xdeadbeef);2127 const value = @intToPtr(*align(1) const fn () void, 0xdeadbeef);
2128 try expectFmt("pointer: fn() void@deadbeef\n", "pointer: {}\n", .{value});2128 try expectFmt("pointer: fn() void@deadbeef\n", "pointer: {}\n", .{value});
2129 }2129 }
2130 {2130 {
2131 const value = @intToPtr(*const fn () void, 0xdeadbeef);2131 const value = @intToPtr(*align(1) const fn () void, 0xdeadbeef);
2132 try expectFmt("pointer: fn() void@deadbeef\n", "pointer: {}\n", .{value});2132 try expectFmt("pointer: fn() void@deadbeef\n", "pointer: {}\n", .{value});
2133 }2133 }
2134}2134}
lib/std/zig/c_translation.zig+1-1
...@@ -136,7 +136,7 @@ test "cast" {...@@ -136,7 +136,7 @@ test "cast" {
136 const FnPtr = if (@import("builtin").zig_backend == .stage1)136 const FnPtr = if (@import("builtin").zig_backend == .stage1)
137 ?fn (*anyopaque) void137 ?fn (*anyopaque) void
138 else138 else
139 ?*const fn (*anyopaque) void;139 ?*align(1) const fn (*anyopaque) void;
140 try testing.expect(cast(FnPtr, 0) == @intToPtr(FnPtr, @as(usize, 0)));140 try testing.expect(cast(FnPtr, 0) == @intToPtr(FnPtr, @as(usize, 0)));
141 try testing.expect(cast(FnPtr, foo) == @intToPtr(FnPtr, @bitCast(usize, @as(isize, -1))));141 try testing.expect(cast(FnPtr, foo) == @intToPtr(FnPtr, @bitCast(usize, @as(isize, -1))));
142}142}