authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-12-11 19:32:23+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-12-14 14:08:21+02:00
loge6588857dfb7a4528e698604d31cc2a5e26c0fb8
tree63a080325da48dddd44156e375c11328327e9132
parent41913ddb1a94591c305870ad2854ecff67ac3242

Sema: fix memory management of union enum tag int tag

This likely went unnoticed due to all power of two integer types being special cased. Closes #13812

2 files changed, 12 insertions(+), 2 deletions(-)

src/Sema.zig+3-2
......@@ -30757,16 +30757,17 @@ fn generateUnionTagTypeNumbered(
3075730757 new_decl.name_fully_qualified = true;
3075830758 errdefer mod.abortAnonDecl(new_decl_index);
3075930759
30760 const copied_int_ty = try int_ty.copy(new_decl_arena_allocator);
3076030761 enum_obj.* = .{
3076130762 .owner_decl = new_decl_index,
30762 .tag_ty = int_ty,
30763 .tag_ty = copied_int_ty,
3076330764 .fields = .{},
3076430765 .values = .{},
3076530766 };
3076630767 // Here we pre-allocate the maps using the decl arena.
3076730768 try enum_obj.fields.ensureTotalCapacity(new_decl_arena_allocator, fields_len);
3076830769 try enum_obj.values.ensureTotalCapacityContext(new_decl_arena_allocator, fields_len, .{
30769 .ty = int_ty,
30770 .ty = copied_int_ty,
3077030771 .mod = mod,
3077130772 });
3077230773 try new_decl.finalizeNewArena(&new_decl_arena);
test/behavior/union.zig+9
......@@ -1465,3 +1465,12 @@ test "Namespace-like union" {
14651465 var a: DepType.Version.Git = .tag;
14661466 try expect(a.frozen());
14671467}
1468
1469test "union int tag type is properly managed" {
1470 const Bar = union(enum(u2)) {
1471 x: bool,
1472 y: u8,
1473 z: u8,
1474 };
1475 try expect(@sizeOf(Bar) + 1 == 3);
1476}