authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-07-16 15:56:16+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-07-23 15:40:11+03:00
log76d099950aa2e5fee4897c8bc401946f39ed87a4
treece8b2a2ed2673777f2f4a0aa73351c47491bfd0c
parent0782586b15302654501ebbcab3a2c63755a6fadb

Sema: cast negative to unsigned safety

4 files changed, 18 insertions(+), 12 deletions(-)

src/Sema.zig+5-2
......@@ -8092,6 +8092,7 @@ fn intCast(
80928092 const is_in_range = try block.addBinOp(.cmp_lte, diff_unsigned, dest_range);
80938093 break :ok is_in_range;
80948094 };
8095 // TODO negative_to_unsigned?
80958096 try sema.addSafetyCheck(block, ok, .cast_truncated_data);
80968097 } else {
80978098 const ok = if (is_vector) ok: {
......@@ -8116,7 +8117,7 @@ fn intCast(
81168117 const ok = if (is_vector) ok: {
81178118 const zero_val = try Value.Tag.repeated.create(sema.arena, Value.zero);
81188119 const zero_inst = try sema.addConstant(operand_ty, zero_val);
8119 const is_in_range = try block.addCmpVector(operand, zero_inst, .lte, try sema.addType(operand_ty));
8120 const is_in_range = try block.addCmpVector(operand, zero_inst, .gte, try sema.addType(operand_ty));
81208121 const all_in_range = try block.addInst(.{
81218122 .tag = .reduce,
81228123 .data = .{ .reduce = .{
......@@ -8130,7 +8131,7 @@ fn intCast(
81308131 const is_in_range = try block.addBinOp(.cmp_gte, operand, zero_inst);
81318132 break :ok is_in_range;
81328133 };
8133 try sema.addSafetyCheck(block, ok, .cast_truncated_data);
8134 try sema.addSafetyCheck(block, ok, .negative_to_unsigned);
81348135 }
81358136 }
81368137 return block.addTyOp(.intcast, dest_ty, operand);
......@@ -18849,6 +18850,7 @@ pub const PanicId = enum {
1884918850 incorrect_alignment,
1885018851 invalid_error_code,
1885118852 cast_truncated_data,
18853 negative_to_unsigned,
1885218854 integer_overflow,
1885318855 shl_overflow,
1885418856 shr_overflow,
......@@ -19069,6 +19071,7 @@ fn safetyPanic(
1906919071 .incorrect_alignment => "incorrect alignment",
1907019072 .invalid_error_code => "invalid error code",
1907119073 .cast_truncated_data => "integer cast truncated bits",
19074 .negative_to_unsigned => "attempt to cast negative value to unsigned integer",
1907219075 .integer_overflow => "integer overflow",
1907319076 .shl_overflow => "left shift overflowed bits",
1907419077 .shr_overflow => "right shift overflowed bits",
test/cases/safety/signed integer not fitting in cast to unsigned integer - widening.zig +6-4
......@@ -1,9 +1,11 @@
11const std = @import("std");
22
33pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace) noreturn {
4 _ = message;
54 _ = stack_trace;
6 std.process.exit(0);
5 if (std.mem.eql(u8, message, "attempt to cast negative value to unsigned integer")) {
6 std.process.exit(0);
7 }
8 std.process.exit(1);
79}
810pub fn main() !void {
911 var value: c_short = -1;
......@@ -12,5 +14,5 @@ pub fn main() !void {
1214 return error.TestFailed;
1315}
1416// run
15// backend=stage1
16// target=native
\ No newline at end of file
17// backend=llvm
18// target=native
test/cases/safety/signed integer not fitting in cast to unsigned integer.zig +6-5
......@@ -1,11 +1,12 @@
11const std = @import("std");
22
33pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace) noreturn {
4 _ = message;
54 _ = stack_trace;
6 std.process.exit(0);
5 if (std.mem.eql(u8, message, "attempt to cast negative value to unsigned integer")) {
6 std.process.exit(0);
7 }
8 std.process.exit(1);
79}
8
910pub fn main() !void {
1011 const x = unsigned_cast(-10);
1112 if (x == 0) return error.Whatever;
......@@ -15,5 +16,5 @@ fn unsigned_cast(x: i32) u32 {
1516 return @intCast(u32, x);
1617}
1718// run
18// backend=stage1
19// target=native
\ No newline at end of file
19// backend=llvm
20// target=native
test/cases/safety/signed-unsigned vector cast.zig +1-1
......@@ -16,5 +16,5 @@ pub fn main() !void {
1616}
1717
1818// run
19// backend=stage1
19// backend=llvm
2020// target=native