Skip to content

Commit 683ace7

Browse files
committed
Merge remote-tracking branch 'origin/master' into llvm14
2 parents d8fc8d0 + 6279a1d commit 683ace7

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
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/os/linux/io_uring.zig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1902,6 +1902,12 @@ test "openat" {
19021902
const path = "test_io_uring_openat";
19031903
defer std.fs.cwd().deleteFile(path) catch {};
19041904

1905+
// Workaround for LLVM bug: https://github.com/ziglang/zig/issues/12014
1906+
const path_addr = if (builtin.zig_backend == .stage2_llvm) p: {
1907+
var workaround = path;
1908+
break :p @ptrToInt(workaround);
1909+
} else @ptrToInt(path);
1910+
19051911
const flags: u32 = os.O.CLOEXEC | os.O.RDWR | os.O.CREAT;
19061912
const mode: os.mode_t = 0o666;
19071913
const sqe_openat = try ring.openat(0x33333333, linux.AT.FDCWD, path, flags, mode);
@@ -1911,7 +1917,7 @@ test "openat" {
19111917
.ioprio = 0,
19121918
.fd = linux.AT.FDCWD,
19131919
.off = 0,
1914-
.addr = @ptrToInt(path),
1920+
.addr = path_addr,
19151921
.len = mode,
19161922
.rw_flags = flags,
19171923
.user_data = 0x33333333,

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)