Sema: @floatToInt safety

This commit is contained in:
Veikka Tuominen 2022-07-16 23:16:18 +03:00
parent ff7ec4efb5
commit 711b656773
5 changed files with 33 additions and 13 deletions

View File

@ -15938,7 +15938,16 @@ fn zirFloatToInt(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!
}
try sema.requireRuntimeBlock(block, inst_data.src(), operand_src);
return block.addTyOp(.float_to_int, dest_ty, operand);
const result = try block.addTyOp(.float_to_int, dest_ty, operand);
if (block.wantSafety()) {
const back = try block.addTyOp(.int_to_float, operand_ty, result);
const diff = try block.addBinOp(.sub, operand, back);
const ok_pos = try block.addBinOp(.cmp_lt, diff, try sema.addConstant(operand_ty, Value.one));
const ok_neg = try block.addBinOp(.cmp_gt, diff, try sema.addConstant(operand_ty, Value.negative_one));
const ok = try block.addBinOp(.bool_and, ok_pos, ok_neg);
try sema.addSafetyCheck(block, ok, .integer_part_out_of_bounds);
}
return result;
}
fn zirIntToFloat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
@ -18924,6 +18933,7 @@ pub const PanicId = enum {
exact_division_remainder,
/// TODO make this call `std.builtin.panicInactiveUnionField`.
inactive_union_field,
integer_part_out_of_bounds,
};
fn addSafetyCheck(
@ -19147,6 +19157,7 @@ fn safetyPanic(
.remainder_division_zero_negative => "remainder division by zero or negative value",
.exact_division_remainder => "exact division produced remainder",
.inactive_union_field => "access of inactive union field",
.integer_part_out_of_bounds => "integer part of floating point value out of bounds",
};
const msg_inst = msg_inst: {

View File

@ -127,6 +127,7 @@ test "@intToFloat(f80)" {
}
fn testIntToFloat(comptime Int: type, k: Int) !void {
@setRuntimeSafety(false); // TODO
const f = @intToFloat(f80, k);
const i = @floatToInt(Int, f);
try expect(i == k);
@ -151,6 +152,8 @@ test "@intToFloat(f80)" {
test "@floatToInt" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
try testFloatToInts();
comptime try testFloatToInts();

View File

@ -1,9 +1,11 @@
const std = @import("std");
pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace) noreturn {
_ = message;
_ = stack_trace;
std.process.exit(0);
if (std.mem.eql(u8, message, "integer part of floating point value out of bounds")) {
std.process.exit(0);
}
std.process.exit(1);
}
pub fn main() !void {
baz(bar(-129.1));
@ -14,5 +16,5 @@ fn bar(a: f32) i8 {
}
fn baz(_: i8) void { }
// run
// backend=stage1
// target=native
// backend=llvm
// target=native

View File

@ -1,9 +1,11 @@
const std = @import("std");
pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace) noreturn {
_ = message;
_ = stack_trace;
std.process.exit(0);
if (std.mem.eql(u8, message, "integer part of floating point value out of bounds")) {
std.process.exit(0);
}
std.process.exit(1);
}
pub fn main() !void {
baz(bar(-1.1));
@ -14,5 +16,5 @@ fn bar(a: f32) u8 {
}
fn baz(_: u8) void { }
// run
// backend=stage1
// target=native
// backend=llvm
// target=native

View File

@ -1,9 +1,11 @@
const std = @import("std");
pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace) noreturn {
_ = message;
_ = stack_trace;
std.process.exit(0);
if (std.mem.eql(u8, message, "integer part of floating point value out of bounds")) {
std.process.exit(0);
}
std.process.exit(1);
}
pub fn main() !void {
baz(bar(256.2));
@ -14,5 +16,5 @@ fn bar(a: f32) u8 {
}
fn baz(_: u8) void { }
// run
// backend=stage1
// target=native
// backend=llvm
// target=native