Commit 94fd914e584d466808f40b9eb5fac49c1cc3c66a | zig

author	John Schmidt <john.schmidt.h@gmail.com> 2022-04-04 16:48:01+02:00
committer	John Schmidt <john.schmidt.h@gmail.com> 2022-04-04 17:03:09+02:00
log	94fd914e584d466808f40b9eb5fac49c1cc3c66a
tree	2c226d3ef0599d032eb8157a810c305608022510
parent	17b804f56b0e75962d3e78a8bade1affa7984b4e

Address review comments

2 files changed, 30 insertions(+), 15 deletions(-)

src
- Sema.zig
test
- compile_errors
  - stage2
    union_duplicate_enum_field.zig

src/Sema.zig+14-15

 @@ -22106,7 +22106,7 @@ fn semaUnionFields(block: *Block, mod: *Module, union_obj: *Module.Union) Compil
             // The fields of the union must match the enum exactly.
             // Store a copy of the enum field names so we can check for
             // missing or extraneous fields later.
-            tag_ty_field_names = try union_obj.tag_ty.enumFields().clone(decl_arena_allocator);
+            tag_ty_field_names = try union_obj.tag_ty.enumFields().clone(sema.arena);
         }
     } else {
         // If auto_enum_tag is false, this is an untagged union. However, for semantic analysis
 @@ -22200,20 +22200,6 @@ fn semaUnionFields(block: *Block, mod: *Module, union_obj: *Module.Union) Compil
             set.putAssumeCapacity(field_name, {});
         }
-        if (tag_ty_field_names) |*names| {
-            const enum_has_field = names.contains(field_name);
-            if (!enum_has_field) {
-                const msg = msg: {
-                    const msg = try sema.errMsg(block, src, "enum '{}' has no field named '{s}'", .{ union_obj.tag_ty.fmt(target), field_name });
-                    errdefer msg.destroy(sema.gpa);
-                    try sema.addDeclaredHereNote(msg, union_obj.tag_ty);
-                    break :msg msg;
-                };
-                return sema.failWithOwnedErrorMsg(block, msg);
-            }
-            _ = names.orderedRemove(field_name);
-        }
         const field_ty: Type = if (!has_type)
             Type.void
         else if (field_type_ref == .none)
 @@ -22245,6 +22231,19 @@ fn semaUnionFields(block: *Block, mod: *Module, union_obj: *Module.Union) Compil
             return sema.failWithOwnedErrorMsg(&block_scope, msg);
         }
+        if (tag_ty_field_names) |*names| {
+            const enum_has_field = names.orderedRemove(field_name);
+            if (!enum_has_field) {
+                const msg = msg: {
+                    const msg = try sema.errMsg(block, src, "enum '{}' has no field named '{s}'", .{ union_obj.tag_ty.fmt(target), field_name });
+                    errdefer msg.destroy(sema.gpa);
+                    try sema.addDeclaredHereNote(msg, union_obj.tag_ty);
+                    break :msg msg;
+                };
+                return sema.failWithOwnedErrorMsg(block, msg);
+            }
+        }
         gop.value_ptr.* = .{
             .ty = try field_ty.copy(decl_arena_allocator),
             .abi_align = 0,

test/compile_errors/stage2/union_duplicate_enum_field.zig created+16

...	@@ -0,0 +1,16 @@
1	const E = enum {a, b};
2	const U = union(E) {
3	a: u32,
4	a: u32,
5	};
6
7	export fn foo() void {
8	var u: U = .{ .a = 123 };
9	_ = u;
10	}
11
12	// union with enum and duplicate fields
13	//
14	// :4:5: error: duplicate union field: 'a'
15	// :3:5: note: other field here
16	// :2:11: note: union declared here