authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-09-26 13:58:55+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-09-26 13:58:55+03:00
log8849792789331faec0caaca18822227ecdb9bc62
treea93d14f828db1e4e610eaa7dd1b8d71faf9c42d9
parent6d7b0690a0e49819ffd92e330f0fd48a7abc0d16
parentb6bda5183e44e88b53d3e51c3599d8889fb1bdb8
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #12951 from schmee/fix-add-field-err-note-oob

sema: load the correct AST in addFieldErrNote

3 files changed, 63 insertions(+), 18 deletions(-)

src/Sema.zig+21-18
......@@ -1868,9 +1868,11 @@ fn failWithInvalidComptimeFieldStore(sema: *Sema, block: *Block, init_src: LazyS
18681868 errdefer msg.destroy(sema.gpa);
18691869
18701870 const decl_index = container_ty.getOwnerDeclOrNull() orelse break :msg msg;
1871
1872 const tree = try sema.getAstTree(block);
18731871 const decl = sema.mod.declPtr(decl_index);
1872 const tree = decl.getFileScope().getTree(sema.gpa) catch |err| {
1873 log.err("unable to load AST to report compile error: {s}", .{@errorName(err)});
1874 return error.AnalysisFail;
1875 };
18741876 const field_src = enumFieldSrcLoc(decl, tree.*, 0, field_index);
18751877 const default_value_src: LazySrcLoc = .{ .node_offset_field_default = field_src.node_offset.x };
18761878
......@@ -1908,7 +1910,6 @@ fn errNote(
19081910
19091911fn addFieldErrNote(
19101912 sema: *Sema,
1911 block: *Block,
19121913 container_ty: Type,
19131914 field_index: usize,
19141915 parent: *Module.ErrorMsg,
......@@ -1918,7 +1919,10 @@ fn addFieldErrNote(
19181919 const mod = sema.mod;
19191920 const decl_index = container_ty.getOwnerDecl();
19201921 const decl = mod.declPtr(decl_index);
1921 const tree = try sema.getAstTree(block);
1922 const tree = decl.getFileScope().getTree(sema.gpa) catch |err| {
1923 log.err("unable to load AST to report compile error: {s}", .{@errorName(err)});
1924 return error.AnalysisFail;
1925 };
19221926 const field_src = enumFieldSrcLoc(decl, tree.*, 0, field_index);
19231927 try mod.errNoteNonLazy(field_src.toSrcLoc(decl), parent, format, args);
19241928}
......@@ -9371,7 +9375,6 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
93719375
93729376 const field_name = operand_ty.enumFieldName(i);
93739377 try sema.addFieldErrNote(
9374 block,
93759378 operand_ty,
93769379 i,
93779380 msg,
......@@ -17379,7 +17382,7 @@ fn zirReify(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData, in
1737917382 const enum_ty = union_obj.tag_ty;
1738017383 for (names.keys()) |field_name| {
1738117384 const field_index = enum_ty.enumFieldIndex(field_name).?;
17382 try sema.addFieldErrNote(block, enum_ty, field_index, msg, "field '{s}' missing, declared here", .{field_name});
17385 try sema.addFieldErrNote(enum_ty, field_index, msg, "field '{s}' missing, declared here", .{field_name});
1738317386 }
1738417387 try sema.addDeclaredHereNote(msg, union_obj.tag_ty);
1738517388 break :msg msg;
......@@ -17667,7 +17670,7 @@ fn reifyStruct(
1766717670 sema.resolveTypeLayout(block, src, field.ty) catch |err| switch (err) {
1766817671 error.AnalysisFail => {
1766917672 const msg = sema.err orelse return err;
17670 try sema.addFieldErrNote(block, struct_ty, index, msg, "while checking this field", .{});
17673 try sema.addFieldErrNote(struct_ty, index, msg, "while checking this field", .{});
1767117674 return err;
1767217675 },
1767317676 else => return err,
......@@ -22270,7 +22273,7 @@ fn unionFieldPtr(
2227022273 const msg = try sema.errMsg(block, src, "cannot initialize 'noreturn' field of union", .{});
2227122274 errdefer msg.destroy(sema.gpa);
2227222275
22273 try sema.addFieldErrNote(block, union_ty, field_index, msg, "field '{s}' declared here", .{field_name});
22276 try sema.addFieldErrNote(union_ty, field_index, msg, "field '{s}' declared here", .{field_name});
2227422277 try sema.addDeclaredHereNote(msg, union_ty);
2227522278 break :msg msg;
2227622279 };
......@@ -25748,7 +25751,7 @@ fn coerceEnumToUnion(
2574825751 errdefer msg.destroy(sema.gpa);
2574925752
2575025753 const field_name = union_obj.fields.keys()[field_index];
25751 try sema.addFieldErrNote(block, union_ty, field_index, msg, "field '{s}' declared here", .{field_name});
25754 try sema.addFieldErrNote(union_ty, field_index, msg, "field '{s}' declared here", .{field_name});
2575225755 try sema.addDeclaredHereNote(msg, union_ty);
2575325756 break :msg msg;
2575425757 };
......@@ -25762,7 +25765,7 @@ fn coerceEnumToUnion(
2576225765 });
2576325766 errdefer msg.destroy(sema.gpa);
2576425767
25765 try sema.addFieldErrNote(block, union_ty, field_index, msg, "field '{s}' declared here", .{field_name});
25768 try sema.addFieldErrNote(union_ty, field_index, msg, "field '{s}' declared here", .{field_name});
2576625769 try sema.addDeclaredHereNote(msg, union_ty);
2576725770 break :msg msg;
2576825771 };
......@@ -25804,7 +25807,7 @@ fn coerceEnumToUnion(
2580425807 );
2580525808 msg = err_msg;
2580625809
25807 try sema.addFieldErrNote(block, union_ty, i, err_msg, "'noreturn' field here", .{});
25810 try sema.addFieldErrNote(union_ty, i, err_msg, "'noreturn' field here", .{});
2580825811 }
2580925812 }
2581025813 if (msg) |some| {
......@@ -25834,7 +25837,7 @@ fn coerceEnumToUnion(
2583425837 const field_name = field.key_ptr.*;
2583525838 const field_ty = field.value_ptr.ty;
2583625839 if (!field_ty.hasRuntimeBits()) continue;
25837 try sema.addFieldErrNote(block, union_ty, field_index, msg, "field '{s}' has type '{}'", .{ field_name, field_ty.fmt(sema.mod) });
25840 try sema.addFieldErrNote(union_ty, field_index, msg, "field '{s}' has type '{}'", .{ field_name, field_ty.fmt(sema.mod) });
2583825841 }
2583925842 try sema.addDeclaredHereNote(msg, union_ty);
2584025843 break :msg msg;
......@@ -28056,7 +28059,7 @@ fn resolveStructLayout(
2805628059 sema.resolveTypeLayout(block, src, field.ty) catch |err| switch (err) {
2805728060 error.AnalysisFail => {
2805828061 const msg = sema.err orelse return err;
28059 try sema.addFieldErrNote(block, ty, i, msg, "while checking this field", .{});
28062 try sema.addFieldErrNote(ty, i, msg, "while checking this field", .{});
2806028063 return err;
2806128064 },
2806228065 else => return err,
......@@ -28076,7 +28079,7 @@ fn resolveStructLayout(
2807628079 _ = sema.typeRequiresComptime(field.ty) catch |err| switch (err) {
2807728080 error.AnalysisFail => {
2807828081 const msg = sema.err orelse return err;
28079 try sema.addFieldErrNote(block, ty, i, msg, "while checking this field", .{});
28082 try sema.addFieldErrNote(ty, i, msg, "while checking this field", .{});
2808028083 return err;
2808128084 },
2808228085 else => return err,
......@@ -28215,7 +28218,7 @@ fn resolveUnionLayout(
2821528218 sema.resolveTypeLayout(block, src, field.ty) catch |err| switch (err) {
2821628219 error.AnalysisFail => {
2821728220 const msg = sema.err orelse return err;
28218 try sema.addFieldErrNote(block, ty, i, msg, "while checking this field", .{});
28221 try sema.addFieldErrNote(ty, i, msg, "while checking this field", .{});
2821928222 return err;
2822028223 },
2822128224 else => return err,
......@@ -29101,7 +29104,7 @@ fn semaUnionFields(mod: *Module, union_obj: *Module.Union) CompileError!void {
2910129104 const enum_ty = union_obj.tag_ty;
2910229105 for (names.keys()) |field_name| {
2910329106 const field_index = enum_ty.enumFieldIndex(field_name).?;
29104 try sema.addFieldErrNote(&block_scope, enum_ty, field_index, msg, "field '{s}' missing, declared here", .{field_name});
29107 try sema.addFieldErrNote(enum_ty, field_index, msg, "field '{s}' missing, declared here", .{field_name});
2910529108 }
2910629109 try sema.addDeclaredHereNote(msg, union_obj.tag_ty);
2910729110 break :msg msg;
......@@ -29376,7 +29379,7 @@ pub fn typeHasOnePossibleValue(
2937629379 "struct '{}' depends on itself",
2937729380 .{ty.fmt(sema.mod)},
2937829381 );
29379 try sema.addFieldErrNote(block, resolved_ty, i, msg, "while checking this field", .{});
29382 try sema.addFieldErrNote(resolved_ty, i, msg, "while checking this field", .{});
2938029383 return sema.failWithOwnedErrorMsg(msg);
2938129384 }
2938229385 if ((try sema.typeHasOnePossibleValue(block, src, field.ty)) == null) {
......@@ -29462,7 +29465,7 @@ pub fn typeHasOnePossibleValue(
2946229465 "union '{}' depends on itself",
2946329466 .{ty.fmt(sema.mod)},
2946429467 );
29465 try sema.addFieldErrNote(block, resolved_ty, 0, msg, "while checking this field", .{});
29468 try sema.addFieldErrNote(resolved_ty, 0, msg, "while checking this field", .{});
2946629469 return sema.failWithOwnedErrorMsg(msg);
2946729470 }
2946829471 const val_val = (try sema.typeHasOnePossibleValue(block, src, only_field.ty)) orelse
test/cases/compile_errors/unhandled_enum_value_in_switch_with_enum_declared_in_other_file.zig created+16
......@@ -0,0 +1,16 @@
1const std = @import("std");
2
3pub export fn entry1() void {
4 const order: std.math.Order = .lt;
5 switch (order) {}
6}
7
8// error
9// backend=stage2
10// target=native
11//
12// :5:5: error: switch must handle all possibilities
13// :?:?: note: unhandled enumeration value: 'lt'
14// :?:?: note: unhandled enumeration value: 'eq'
15// :?:?: note: unhandled enumeration value: 'gt'
16// :?:?: note: enum 'math.Order' declared here
test/compile_errors.zig+26
......@@ -225,6 +225,32 @@ pub fn addCases(ctx: *TestContext) !void {
225225 });
226226 }
227227
228 {
229 const case = ctx.obj("invalid store to comptime field", .{});
230 case.backend = .stage2;
231
232 case.addSourceFile("a.zig",
233 \\pub const S = struct {
234 \\ comptime foo: u32 = 1,
235 \\ bar: u32,
236 \\ pub fn foo(x: @This()) void {
237 \\ _ = x;
238 \\ }
239 \\};
240 );
241
242 case.addError(
243 \\const a = @import("a.zig");
244 \\
245 \\export fn entry() void {
246 \\ _ = a.S.foo(a.S{ .foo = 2, .bar = 2 });
247 \\}
248 , &[_][]const u8{
249 ":4:23: error: value stored in comptime field does not match the default value of the field",
250 ":2:25: note: default value set here",
251 });
252 }
253
228254 // TODO test this in stage2, but we won't even try in stage1
229255 //ctx.objErrStage1("inline fn calls itself indirectly",
230256 // \\export fn foo() void {