authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-10-06 05:05:43+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-10-06 05:05:43+02:00
log069986fdbf4c6fe99547a9cf9df3b44d4c030c43
treef357009217b6908f4af6f7831c9645fc5d7bf2fa
parenta7a6d1730db30d6541eedf3be1531d323eb7a93a
parent8d47bbdbe032cb49aac829ba349669a63cc17943

Merge pull request 'Sema: emit shr instead of shr_exact when @shrExact is used and wantSafety is true' (#37104) from rpkak/zig:safe-shrExact into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/37104 Reviewed-by: Alex Rønne Petersen <alex@alexrp.com>

2 files changed, 18 insertions(+), 24 deletions(-)

doc/langref/runtime_shrExact_overflow.zig-3
...@@ -1,4 +1,3 @@...@@ -1,4 +1,3 @@
1const builtin = @import("builtin");
2const std = @import("std");1const std = @import("std");
32
4pub fn main() void {3pub fn main() void {
...@@ -6,8 +5,6 @@ pub fn main() void {...@@ -6,8 +5,6 @@ pub fn main() void {
6 _ = &x;5 _ = &x;
7 const y = @shrExact(x, 2);6 const y = @shrExact(x, 2);
8 std.debug.print("value: {}\n", .{y});7 std.debug.print("value: {}\n", .{y});
9
10 if ((builtin.cpu.arch.isPowerPC() or builtin.cpu.arch.isRISCV() or builtin.cpu.arch.isLoongArch() or builtin.cpu.arch == .s390x) and builtin.zig_backend == .stage2_llvm) @panic("https://github.com/ziglang/zig/issues/24304");
11}8}
129
13// exe=fail10// exe=fail
src/Sema.zig+18-21
...@@ -1231,8 +1231,8 @@ fn analyzeBodyInner(...@@ -1231,8 +1231,8 @@ fn analyzeBodyInner(
1231 .ref => try sema.zirRef(block, inst),1231 .ref => try sema.zirRef(block, inst),
1232 .deref => try sema.zirDeref(block, inst),1232 .deref => try sema.zirDeref(block, inst),
1233 .ref_deref => try sema.zirRefDeref(block, inst),1233 .ref_deref => try sema.zirRefDeref(block, inst),
1234 .shr => try sema.zirShr(block, inst, .shr),1234 .shr => try sema.zirShr(block, inst, false),
1235 .shr_exact => try sema.zirShr(block, inst, .shr_exact),1235 .shr_exact => try sema.zirShr(block, inst, true),
1236 .slice_end => try sema.zirSliceEnd(block, inst),1236 .slice_end => try sema.zirSliceEnd(block, inst),
1237 .slice_sentinel => try sema.zirSliceSentinel(block, inst),1237 .slice_sentinel => try sema.zirSliceSentinel(block, inst),
1238 .slice_start => try sema.zirSliceStart(block, inst),1238 .slice_start => try sema.zirSliceStart(block, inst),
...@@ -13176,7 +13176,7 @@ fn zirShr(...@@ -13176,7 +13176,7 @@ fn zirShr(
13176 sema: *Sema,13176 sema: *Sema,
13177 block: *Block,13177 block: *Block,
13178 inst: Zir.Inst.Index,13178 inst: Zir.Inst.Index,
13179 air_tag: Air.Inst.Tag,13179 exact: bool,
13180) CompileError!Air.Inst.Ref {13180) CompileError!Air.Inst.Ref {
13181 const pt = sema.pt;13181 const pt = sema.pt;
13182 const zcu = pt.zcu;13182 const zcu = pt.zcu;
...@@ -13188,16 +13188,15 @@ fn zirShr(...@@ -13188,16 +13188,15 @@ fn zirShr(
13188 const rhs_ty = sema.typeOf(rhs);13188 const rhs_ty = sema.typeOf(rhs);
1318913189
13190 const src = block.nodeOffset(inst_data.src_node);13190 const src = block.nodeOffset(inst_data.src_node);
13191 const lhs_src = switch (air_tag) {13191 const lhs_src = if (exact)
13192 .shr => block.src(.{ .node_offset_bin_lhs = inst_data.src_node }),13192 block.builtinCallArgSrc(inst_data.src_node, 0)
13193 .shr_exact => block.builtinCallArgSrc(inst_data.src_node, 0),13193 else
13194 else => unreachable,13194 block.src(.{ .node_offset_bin_lhs = inst_data.src_node });
13195 };13195
13196 const rhs_src = switch (air_tag) {13196 const rhs_src = if (exact)
13197 .shr => block.src(.{ .node_offset_bin_rhs = inst_data.src_node }),13197 block.builtinCallArgSrc(inst_data.src_node, 1)
13198 .shr_exact => block.builtinCallArgSrc(inst_data.src_node, 1),13198 else
13199 else => unreachable,13199 block.src(.{ .node_offset_bin_rhs = inst_data.src_node });
13200 };
1320113200
13202 try sema.checkVectorizableBinaryOperands(block, src, lhs_ty, rhs_ty, lhs_src, rhs_src);13201 try sema.checkVectorizableBinaryOperands(block, src, lhs_ty, rhs_ty, lhs_src, rhs_src);
13203 const scalar_ty = lhs_ty.scalarType(zcu);13202 const scalar_ty = lhs_ty.scalarType(zcu);
...@@ -13208,11 +13207,7 @@ fn zirShr(...@@ -13208,11 +13207,7 @@ fn zirShr(
13208 const runtime_src = rs: {13207 const runtime_src = rs: {
13209 if (maybe_rhs_val) |rhs_val| {13208 if (maybe_rhs_val) |rhs_val| {
13210 if (maybe_lhs_val) |lhs_val| {13209 if (maybe_lhs_val) |lhs_val| {
13211 return .fromValue(try arith.shr(sema, block, lhs_ty, rhs_ty, lhs_val, rhs_val, src, lhs_src, rhs_src, switch (air_tag) {13210 return .fromValue(try arith.shr(sema, block, lhs_ty, rhs_ty, lhs_val, rhs_val, src, lhs_src, rhs_src, if (exact) .shr_exact else .shr));
13212 .shr => .shr,
13213 .shr_exact => .shr_exact,
13214 else => unreachable,
13215 }));
13216 }13211 }
13217 if (rhs_val.isUndef(zcu)) {13212 if (rhs_val.isUndef(zcu)) {
13218 return sema.failWithUseOfUndef(block, rhs_src, null);13213 return sema.failWithUseOfUndef(block, rhs_src, null);
...@@ -13269,8 +13264,10 @@ fn zirShr(...@@ -13269,8 +13264,10 @@ fn zirShr(
13269 break :rs rhs_src;13264 break :rs rhs_src;
13270 };13265 };
13271 try sema.requireRuntimeBlock(block, src, runtime_src);13266 try sema.requireRuntimeBlock(block, src, runtime_src);
13272 const result = try block.addBinOp(air_tag, lhs, rhs);13267
13273 if (block.wantSafety()) {13268 const safety = block.wantSafety();
13269 const result = try block.addBinOp(if (!exact or safety) .shr else .shr_exact, lhs, rhs);
13270 if (safety) {
13274 const bit_count = scalar_ty.intInfo(zcu).bits;13271 const bit_count = scalar_ty.intInfo(zcu).bits;
13275 if (!std.math.isPowerOfTwo(bit_count)) {13272 if (!std.math.isPowerOfTwo(bit_count)) {
13276 const bit_count_val = try pt.intValue(rhs_ty.scalarType(zcu), bit_count);13273 const bit_count_val = try pt.intValue(rhs_ty.scalarType(zcu), bit_count);
...@@ -13286,7 +13283,7 @@ fn zirShr(...@@ -13286,7 +13283,7 @@ fn zirShr(
13286 try sema.addSafetyCheck(block, src, ok, .shift_rhs_too_big);13283 try sema.addSafetyCheck(block, src, ok, .shift_rhs_too_big);
13287 }13284 }
1328813285
13289 if (air_tag == .shr_exact) {13286 if (exact) {
13290 const back = try block.addBinOp(.shl, result, rhs);13287 const back = try block.addBinOp(.shl, result, rhs);
1329113288
13292 const ok = if (rhs_ty.zigTypeTag(zcu) == .vector) ok: {13289 const ok = if (rhs_ty.zigTypeTag(zcu) == .vector) ok: {