mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 11:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make @intFromEnum an error for empty enums

Browse Source
This commit is contained in:
David Rubin 2024-02-06 11:04:09 -08:00 committed by GitHub
parent 52066bf8e4
commit 24fb6d1f30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Sema.zig
View File

@ -8629,6 +8629,7 @@ fn zirIntFromEnum(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
.{src}, .{src},
); );
}; };
break :blk try sema.unionToTag(block, tag_ty, operand, operand_src); break :blk try sema.unionToTag(block, tag_ty, operand, operand_src);
}, },
else => { else => {
@ -8638,14 +8639,25 @@ fn zirIntFromEnum(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
}, },
}; };
const enum_tag_ty = sema.typeOf(enum_tag); const enum_tag_ty = sema.typeOf(enum_tag);
const int_tag_ty = enum_tag_ty.intTagType(mod); const int_tag_ty = enum_tag_ty.intTagType(mod);
// TODO: use correct solution
// https://github.com/ziglang/zig/issues/15909
if (enum_tag_ty.enumFieldCount(mod) == 0 and !enum_tag_ty.isNonexhaustiveEnum(mod)) {
return sema.fail(block, operand_src, "cannot use @intFromEnum on empty enum '{}'", .{
enum_tag_ty.fmt(mod),
});
}
if (try sema.typeHasOnePossibleValue(enum_tag_ty)) |opv| { if (try sema.typeHasOnePossibleValue(enum_tag_ty)) |opv| {
return Air.internedToRef((try mod.getCoerced(opv, int_tag_ty)).toIntern()); return Air.internedToRef((try mod.getCoerced(opv, int_tag_ty)).toIntern());
} }
if (try sema.resolveValue(enum_tag)) |enum_tag_val| { if (try sema.resolveValue(enum_tag)) |enum_tag_val| {
if (enum_tag_val.isUndef(mod)) {
return mod.undefRef(int_tag_ty);
}
const val = try enum_tag_val.intFromEnum(enum_tag_ty, mod); const val = try enum_tag_val.intFromEnum(enum_tag_ty, mod);
return Air.internedToRef(val.toIntern()); return Air.internedToRef(val.toIntern());
} }
@ -20944,6 +20956,7 @@ fn zirTagName(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air
if (enum_ty.enumFieldCount(mod) == 0) { if (enum_ty.enumFieldCount(mod) == 0) {
// TODO I don't think this is the correct way to handle this but // TODO I don't think this is the correct way to handle this but
// it prevents a crash. // it prevents a crash.
// https://github.com/ziglang/zig/issues/15909
return sema.fail(block, operand_src, "cannot get @tagName of empty enum '{}'", .{ return sema.fail(block, operand_src, "cannot get @tagName of empty enum '{}'", .{
enum_ty.fmt(mod), enum_ty.fmt(mod),
}); });

12
test/cases/compile_errors/int_from_enum_undefined.zig Normal file
View File

@ -0,0 +1,12 @@
export fn a() void {
const E = enum {};
var e: E = undefined;
_ = &e;
_ = @intFromEnum(e);
}
// error
// backend=stage2
// target=native
//
// :5:22: error: cannot use @intFromEnum on empty enum 'tmp.a.E'