Commit 122387943bf1d00c85aba77f37c93072e43140c9 | zig

author	David Rubin <david@vortan.dev> 2024-02-03 11:52:05-08:00
committer	GitHub <noreply@github.com> 2024-02-03 19:52:05+00:00
log	122387943bf1d00c85aba77f37c93072e43140c9
tree	9b2d270404d51c0a0d4f1c05b0302dae76270b57
parent	eb4024036d3e8e0c4a8b0dcf09da107421f3fa01
signature	Signed by PGP key B5690EEEBB952194

Fix OOB when enum field out of order in different file

3 files changed, 7 insertions(+), 5 deletions(-)

src
- Sema.zig
test
- cases
  - compile_errors
    union_enum_field_does_not_match_enum.zig
    union_extra_field.zig

src/Sema.zig+5-3

 @@ -37125,7 +37125,7 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un
                 const msg = msg: {
                     const ty_src = mod.fieldSrcLoc(union_type.decl, .{
                         .index = field_i,
-                        .range = .type,
+                        .range = .name,
                     }).lazy;
                     const msg = try sema.errMsg(&block_scope, ty_src, "no field named '{}' in enum '{}'", .{
                         field_name.fmt(ip), Type.fromInterned(union_type.tagTypePtr(ip).*).fmt(mod),
 @@ -37136,6 +37136,7 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un
                 };
                 return sema.failWithOwnedErrorMsg(&block_scope, msg);
             };
             // No check for duplicate because the check already happened in order
             // to create the enum type in the first place.
             assert(!explicit_tags_seen[enum_index]);
 @@ -37146,14 +37147,15 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un
                 const msg = msg: {
                     const ty_src = mod.fieldSrcLoc(union_type.decl, .{
                         .index = field_i,
-                        .range = .type,
+                        .range = .name,
                     }).lazy;
                     const enum_field_src = mod.fieldSrcLoc(tag_info.decl, .{ .index = enum_index }).lazy;
                     const msg = try sema.errMsg(&block_scope, ty_src, "union field '{}' ordered differently than corresponding enum field", .{
                         field_name.fmt(ip),
                     });
                     errdefer msg.destroy(sema.gpa);
-                    try sema.errNote(&block_scope, enum_field_src, msg, "enum field here", .{});
+                    const decl_ptr = mod.declPtr(tag_info.decl);
+                    try mod.errNoteNonLazy(enum_field_src.toSrcLoc(decl_ptr, mod), msg, "enum field here", .{});
                     break :msg msg;
                 };
                 return sema.failWithOwnedErrorMsg(&block_scope, msg);

test/cases/compile_errors/union_enum_field_does_not_match_enum.zig+1-1

...	@@ -18,5 +18,5 @@ export fn entry() void {	...	@@ -18,5 +18,5 @@ export fn entry() void {
18	// backend=stage2	18	// backend=stage2
19	// target=native	19	// target=native
20	//	20	//
21	// :10:8: error: no field named 'D' in enum 'tmp.Letter'	21	// :10:5: error: no field named 'D' in enum 'tmp.Letter'
22	// :1:16: note: enum declared here	22	// :1:16: note: enum declared here

test/cases/compile_errors/union_extra_field.zig+1-1

...	@@ -16,5 +16,5 @@ export fn entry() usize {	...	@@ -16,5 +16,5 @@ export fn entry() usize {
16	// error	16	// error
17	// target=native	17	// target=native
18	//	18	//
19	// :10:8: error: no field named 'd' in enum 'tmp.E'	19	// :10:5: error: no field named 'd' in enum 'tmp.E'
20	// :1:11: note: enum declared here	20	// :1:11: note: enum declared here