diff --git a/src/Sema.zig b/src/Sema.zig index ae7a50af3c60411ca02704e8fe09ddd64e3b4ec3..2483f313a8992c9ed2295f40cef9868c6e6400dc 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -13677,7 +13677,7 @@ fn zirShl( try sema.requireRuntimeBlock(block, src, runtime_src); if (block.wantSafety()) { const bit_count = scalar_ty.intInfo(zcu).bits; - if (!std.math.isPowerOfTwo(bit_count)) { + if (air_tag != .shl_sat and !std.math.isPowerOfTwo(bit_count)) { const bit_count_val = try pt.intValue(scalar_rhs_ty, bit_count); const ok = if (rhs_ty.zigTypeTag(zcu) == .vector) ok: { const bit_count_inst = Air.internedToRef((try sema.splat(rhs_ty, bit_count_val)).toIntern()); diff --git a/test/behavior/bit_shifting.zig b/test/behavior/bit_shifting.zig index 05b44447086b866588d4bd3767dca0b7b70001a3..8c426dc05e6570813b613d4c6cd7640723cfc3b3 100644 --- a/test/behavior/bit_shifting.zig +++ b/test/behavior/bit_shifting.zig @@ -170,8 +170,6 @@ test "Saturating Shift Left" { const S = struct { fn shlSat(x: anytype, y: std.math.Log2Int(@TypeOf(x))) @TypeOf(x) { - // workaround https://github.com/ziglang/zig/issues/23033 - @setRuntimeSafety(false); return x <<| y; } diff --git a/test/behavior/x86_64/binary.zig b/test/behavior/x86_64/binary.zig index 99dd47155bbfa2225927645ae8d3d154459cc5f3..e90c4f1eb05a45a689a327c3bf46021c0d4ac77e 100644 --- a/test/behavior/x86_64/binary.zig +++ b/test/behavior/x86_64/binary.zig @@ -5473,8 +5473,6 @@ inline fn shlSaturate(comptime Type: type, lhs: Type, rhs: Type) Type { // workaround https://github.com/ziglang/zig/issues/23139 return lhs <<| @min(@abs(rhs), splat(ChangeScalar(Type, u64), imax(u64))); } - // workaround https://github.com/ziglang/zig/issues/23033 - @setRuntimeSafety(false); return lhs <<| @abs(rhs); } test shlSaturate {