motiejus/zig
1
Fork 0
Code Releases Activity

Revert "add a workaround for miscompilation regarding alignment"

Browse Source 
This reverts commit 149aa9afb7.
This commit is contained in:
Alex Rønne Petersen
2024-08-27 08:32:36 +02:00
parent e585103306
commit a2e691d589
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/std/zig/Server.zig
View File

@@ -124,9 +124,9 @@ pub fn receiveMessage(s: *Server) !InMessage.Header {
const buf = fifo.readableSlice(0);
assert(fifo.readableLength() == buf.len);
if (buf.len >= @sizeOf(Header)) {
// workaround for https://github.com/ziglang/zig/issues/14904
const bytes_len = bswap_and_workaround_u32(buf[4..][0..4]);
const tag = bswap_and_workaround_tag(buf[0..][0..4]);
const header: *align(1) const Header = @ptrCast(buf[0..@sizeOf(Header)]);
const bytes_len = bswap(header.bytes_len);
const tag = bswap(header.tag);
if (buf.len - @sizeOf(Header) >= bytes_len) {
fifo.discard(@sizeOf(Header));
@@ -307,17 +307,6 @@ fn bswap_u32_array(slice: []u32) void {
for (slice) |*elem| elem.* = @byteSwap(elem.*);
}
/// workaround for https://github.com/ziglang/zig/issues/14904
fn bswap_and_workaround_u32(bytes_ptr: *const [4]u8) u32 {
return std.mem.readInt(u32, bytes_ptr, .little);
}
/// workaround for https://github.com/ziglang/zig/issues/14904
fn bswap_and_workaround_tag(bytes_ptr: *const [4]u8) InMessage.Tag {
const int = std.mem.readInt(u32, bytes_ptr, .little);
return @as(InMessage.Tag, @enumFromInt(int));
}
const OutMessage = std.zig.Server.Message;
const InMessage = std.zig.Client.Message;