| author |  Matthew Lugg <mlugg@mlugg.co.uk> 2024-08-14 00:08:38+01:00 |
| committer |  Jacob Young <jacobly@ziglang.org> 2024-08-17 18:50:10-04:00 |
| log | 3fb5cad07dd3b10ad32a116cbd7195218b0a93fe |
| tree | fc4ce5844b794bc131a4dde5b4ae2d4885e29ba4 |
| parent | 50960fac80b1d04f7858215d963fa64a7583210b |
Sema: don't delete reified enum type with error in field
An enum type is kind of like a struct or union type, in that field
errors are happening during type resolution. The only difference is that
type resolution happens at the time the type is created. So, errors in
fields should not cause the type to be deleted: we've already added a
reference entry, and incremenetal dependencies which must be invalidated
if the compile error is fixed. Once we call `WipEnumType.prepare`, we
should never call `WipEnumType.cancel`. This is analagous to logic for
enum declarations in `Sema.zirEnumDecl`.1 files changed, 3 insertions(+), 1 deletions(-)
src
src/Sema.zig+3-1
| ... | ... | @@ -22062,7 +22062,8 @@ fn reifyEnum( |
| 22062 | 22062 | return Air.internedToRef(ty); |
| 22063 | 22063 | }, |
| 22064 | 22064 | }; |
| 22065 | errdefer wip_ty.cancel(ip, pt.tid); | |
| 22065 | var done = false; | |
| 22066 | errdefer if (!done) wip_ty.cancel(ip, pt.tid); | |
| 22066 | 22067 | |
| 22067 | 22068 | if (tag_ty.zigTypeTag(mod) != .Int) { |
| 22068 | 22069 | return sema.fail(block, src, "Type.Enum.tag_type must be an integer type", .{}); |
| ... | ... | @@ -22088,6 +22089,7 @@ fn reifyEnum( |
| 22088 | 22089 | try sema.addTypeReferenceEntry(src, wip_ty.index); |
| 22089 | 22090 | wip_ty.prepare(ip, new_cau_index, new_namespace_index); |
| 22090 | 22091 | wip_ty.setTagTy(ip, tag_ty.toIntern()); |
| 22092 | done = true; | |
| 22091 | 22093 | |
| 22092 | 22094 | for (0..fields_len) |field_idx| { |
| 22093 | 22095 | const field_info = try fields_val.elemValue(pt, field_idx); |