mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 04:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: @intToEnum on non-exhaustive enum at comptime should check int is in range

Browse Source 
Closes #14155
This commit is contained in:
Veikka Tuominen 2023-01-02 17:06:06 +02:00
parent aadd1b252e
commit 332a43858a
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Sema.zig
View File

@ -2536,6 +2536,9 @@ fn coerceResultPtr(
.wrap_errunion_payload => {
new_ptr = try sema.analyzeErrUnionPayloadPtr(block, src, new_ptr, false, true);
},
.array_to_slice => {
return sema.fail(block, src, "TODO coerce_result_ptr array_to_slice", .{});
},
else => {
if (std.debug.runtime_safety) {
std.debug.panic("unexpected AIR tag for coerce_result_ptr: {}", .{
@ -7839,7 +7842,23 @@ fn zirIntToEnum(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
if (try sema.resolveMaybeUndefVal(operand)) |int_val| {
if (dest_ty.isNonexhaustiveEnum()) {
return sema.addConstant(dest_ty, int_val);
var buffer: Type.Payload.Bits = undefined;
const int_tag_ty = dest_ty.intTagType(&buffer);
if (try sema.intFitsInType(int_val, int_tag_ty, null)) {
return sema.addConstant(dest_ty, int_val);
}
const msg = msg: {
const msg = try sema.errMsg(
block,
src,
"int value '{}' out of range of non-exhaustive enum '{}'",
.{ int_val.fmtValue(sema.typeOf(operand), sema.mod), dest_ty.fmt(sema.mod) },
);
errdefer msg.destroy(sema.gpa);
try sema.addDeclaredHereNote(msg, dest_ty);
break :msg msg;
};
return sema.failWithOwnedErrorMsg(msg);
}
if (int_val.isUndef()) {
return sema.failWithUseOfUndef(block, operand_src);
@ -32886,7 +32905,7 @@ fn enumHasInt(
int: Value,
) CompileError!bool {
switch (ty.tag()) {
.enum_nonexhaustive => return sema.intFitsInType(int, ty, null),
.enum_nonexhaustive => unreachable,
.enum_full => {
const enum_full = ty.castTag(.enum_full).?.data;
const tag_ty = enum_full.tag_ty;

11
test/cases/compile_errors/intToEnum_on_non-exhaustive_enums_checks_int_in_range.zig Normal file
View File

@ -0,0 +1,11 @@
pub export fn entry() void {
const E = enum(u3) { a, b, c, _ };
@compileLog(@intToEnum(E, 100));
}
// error
// target=native
// backend=stage2
//
// :3:17: error: int value '100' out of range of non-exhaustive enum 'tmp.entry.E'
// :2:15: note: enum declared here