motiejus/zig
1
Fork 0
Code Releases Activity

Sema: improve behavior of comptime_int backed enums

Browse Source
This commit is contained in:
Veikka Tuominen
2022-09-02 16:08:20 +03:00
parent a9cdacff95
commit f281f3d10e
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Sema.zig
View File

@@ -2565,7 +2565,7 @@ fn zirEnumDecl(
}
}
if (small.nonexhaustive) {
if (small.nonexhaustive and enum_obj.tag_ty.zigTypeTag() != .ComptimeInt) {
if (fields_len > 1 and std.math.log2_int(u64, fields_len) == enum_obj.tag_ty.bitSize(sema.mod.getTarget())) {
return sema.fail(block, src, "non-exhaustive enum specifies every value", .{});
}
@@ -20363,12 +20363,13 @@ fn validateRunTimeType(
.Int,
.Float,
.ErrorSet,
.Enum,
.Frame,
.AnyFrame,
.Void,
=> return true,
.Enum => return !(try sema.typeRequiresComptime(block, src, ty)),
.BoundFn,
.ComptimeFloat,
.ComptimeInt,
@@ -29049,7 +29050,7 @@ pub fn typeHasOnePossibleValue(
},
.enum_nonexhaustive => {
const tag_ty = ty.castTag(.enum_nonexhaustive).?.data.tag_ty;
if (!(try sema.typeHasRuntimeBits(block, src, tag_ty))) {
if (tag_ty.zigTypeTag() != .ComptimeInt and !(try sema.typeHasRuntimeBits(block, src, tag_ty))) {
return Value.zero;
} else {
return null;