| author |  Matthew Lugg <mlugg@mlugg.co.uk> 2024-08-24 13:44:41+01:00 |
| committer | Matthew Lugg <mlugg@mlugg.co.uk> 2024-08-24 20:30:52+01:00 |
| log | 7d54c62c8a55240bbe144ab03c78573a344598ce |
| tree | f93383d99f058b4cf1aec8a3088c1c9847f138e0 |
| parent | 2d7c26cc66facc401b37c26cb17bbae1da00d170 |
incremental: fix adding/removing aggregate fields
I don't recall why I put these checks here -- they aren't correct. We
can freely recreate a type even if its fields have changed, because we
are going to re-do all type resolution.
The only conditions for recreations are (a) the ZIR index must not be
lost and (b) the number of captures must be the same. These conditions
are permissible because if either is violated, we can guarantee that
analysis of a valid `zirStructDecl` (etc) will never reference this
type (since the ZIR index has just been tracked, and the captures have
just been created based on the ZIR).
Adds a corresponding test case.
Resolves: #211852 files changed, 23 insertions(+), 3 deletions(-)
src- test
- incremental
src/Zcu/PerThread.zig-3
| ... | ... | @@ -3378,7 +3378,6 @@ fn recreateStructType( |
| 3378 | 3378 | } else 0; |
| 3379 | 3379 | |
| 3380 | 3380 | if (captures_len != key.captures.owned.len) return error.AnalysisFail; |
| 3381 | if (fields_len != struct_obj.field_types.len) return error.AnalysisFail; | |
| 3382 | 3381 | |
| 3383 | 3382 | // The old type will be unused, so drop its dependency information. |
| 3384 | 3383 | ip.removeDependenciesForDepender(gpa, AnalUnit.wrap(.{ .cau = struct_obj.cau.unwrap().? })); |
| ... | ... | @@ -3466,7 +3465,6 @@ fn recreateUnionType( |
| 3466 | 3465 | } else 0; |
| 3467 | 3466 | |
| 3468 | 3467 | if (captures_len != key.captures.owned.len) return error.AnalysisFail; |
| 3469 | if (fields_len != union_obj.field_types.len) return error.AnalysisFail; | |
| 3470 | 3468 | |
| 3471 | 3469 | // The old type will be unused, so drop its dependency information. |
| 3472 | 3470 | ip.removeDependenciesForDepender(gpa, AnalUnit.wrap(.{ .cau = union_obj.cau })); |
| ... | ... | @@ -3577,7 +3575,6 @@ fn recreateEnumType( |
| 3577 | 3575 | } else 0; |
| 3578 | 3576 | |
| 3579 | 3577 | if (captures_len != key.captures.owned.len) return error.AnalysisFail; |
| 3580 | if (fields_len != enum_obj.names.len) return error.AnalysisFail; | |
| 3581 | 3578 | |
| 3582 | 3579 | extra_index += captures_len; |
| 3583 | 3580 | extra_index += decls_len; |
test/incremental/remove_enum_field created+23
| ... | ... | @@ -0,0 +1,23 @@ |
| 1 | #target=x86_64-linux | |
| 2 | #update=initial version | |
| 3 | #file=main.zig | |
| 4 | const MyEnum = enum(u8) { | |
| 5 | foo = 1, | |
| 6 | bar = 2, | |
| 7 | }; | |
| 8 | pub fn main() !void { | |
| 9 | try std.io.getStdOut().writer().print("{}\n", .{@intFromEnum(MyEnum.foo)}); | |
| 10 | } | |
| 11 | const std = @import("std"); | |
| 12 | #expect_stdout="1\n" | |
| 13 | #update=remove enum field | |
| 14 | #file=main.zig | |
| 15 | const MyEnum = enum(u8) { | |
| 16 | //foo = 1, | |
| 17 | bar = 2, | |
| 18 | }; | |
| 19 | pub fn main() !void { | |
| 20 | try std.io.getStdOut().writer().print("{}\n", .{@intFromEnum(MyEnum.foo)}); | |
| 21 | } | |
| 22 | const std = @import("std"); | |
| 23 | #expect_error=ignored |