From b3a40743580c1aca6b6f5d212d3b307d4fd1f16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20=C3=85kesson?= Date: Tue, 24 Aug 2021 21:34:43 +0200 Subject: [PATCH] std: Use truncating cast in WIFSTOPPED for Linux, FreeBSD and DragonFly The intermediate value can be larger than an u16, so @truncate is needed to match the behavior of musl. --- lib/std/os/bits/dragonfly.zig | 2 +- lib/std/os/bits/freebsd.zig | 2 +- lib/std/os/bits/linux.zig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/std/os/bits/dragonfly.zig b/lib/std/os/bits/dragonfly.zig index 5c3ad305da..0b9b567758 100644 --- a/lib/std/os/bits/dragonfly.zig +++ b/lib/std/os/bits/dragonfly.zig @@ -345,7 +345,7 @@ pub fn WIFEXITED(s: u32) bool { return WTERMSIG(s) == 0; } pub fn WIFSTOPPED(s: u32) bool { - return @intCast(u16, (((s & 0xffff) *% 0x10001) >> 8)) > 0x7f00; + return @truncate(u16, (((s & 0xffff) *% 0x10001) >> 8)) > 0x7f00; } pub fn WIFSIGNALED(s: u32) bool { return (s & 0xffff) -% 1 < 0xff; diff --git a/lib/std/os/bits/freebsd.zig b/lib/std/os/bits/freebsd.zig index c3bcafaa65..cc0d3eeca9 100644 --- a/lib/std/os/bits/freebsd.zig +++ b/lib/std/os/bits/freebsd.zig @@ -742,7 +742,7 @@ pub fn WIFEXITED(s: u32) bool { return WTERMSIG(s) == 0; } pub fn WIFSTOPPED(s: u32) bool { - return @intCast(u16, (((s & 0xffff) *% 0x10001) >> 8)) > 0x7f00; + return @truncate(u16, (((s & 0xffff) *% 0x10001) >> 8)) > 0x7f00; } pub fn WIFSIGNALED(s: u32) bool { return (s & 0xffff) -% 1 < 0xff; diff --git a/lib/std/os/bits/linux.zig b/lib/std/os/bits/linux.zig index e8606801ef..e50421f164 100644 --- a/lib/std/os/bits/linux.zig +++ b/lib/std/os/bits/linux.zig @@ -1061,7 +1061,7 @@ pub fn WIFEXITED(s: u32) bool { return WTERMSIG(s) == 0; } pub fn WIFSTOPPED(s: u32) bool { - return @intCast(u16, ((s & 0xffff) *% 0x10001) >> 8) > 0x7f00; + return @truncate(u16, ((s & 0xffff) *% 0x10001) >> 8) > 0x7f00; } pub fn WIFSIGNALED(s: u32) bool { return (s & 0xffff) -% 1 < 0xff;