authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-03-03 15:45:18+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-03-03 22:14:43+02:00
log7691013d10525ded6e02228cf89db94719bac1c5
treedb2bd4cdb7e8164fde96018bb7270788829a00df
parent3605dd307ffff74726cc0ce5099599f1a6f9ddb2

stage2: add 'called from here' error note

2 files changed, 58 insertions(+), 47 deletions(-)

src/Sema.zig+54-46
......@@ -153,6 +153,7 @@ pub const Block = struct {
153153 pub const Inlining = struct {
154154 comptime_result: Air.Inst.Ref,
155155 merges: Merges,
156 err: ?*Module.ErrorMsg = null,
156157 };
157158
158159 pub const Merges = struct {
......@@ -1429,10 +1430,10 @@ pub fn fail(
14291430 args: anytype,
14301431) CompileError {
14311432 const err_msg = try sema.errMsg(block, src, format, args);
1432 return sema.failWithOwnedErrorMsg(err_msg);
1433 return sema.failWithOwnedErrorMsg(block, err_msg);
14331434}
14341435
1435fn failWithOwnedErrorMsg(sema: *Sema, err_msg: *Module.ErrorMsg) CompileError {
1436fn failWithOwnedErrorMsg(sema: *Sema, block: *Block, err_msg: *Module.ErrorMsg) CompileError {
14361437 @setCold(true);
14371438
14381439 if (crash_report.is_enabled and sema.mod.comp.debug_compile_errors) {
......@@ -1445,6 +1446,7 @@ fn failWithOwnedErrorMsg(sema: *Sema, err_msg: *Module.ErrorMsg) CompileError {
14451446 }
14461447
14471448 const mod = sema.mod;
1449 if (block.inlining) |some| some.err = err_msg;
14481450
14491451 {
14501452 errdefer err_msg.destroy(mod.gpa);
......@@ -1969,7 +1971,7 @@ fn zirEnumDecl(
19691971 try sema.errNote(block, other_tag_src, msg, "other tag here", .{});
19701972 break :msg msg;
19711973 };
1972 return sema.failWithOwnedErrorMsg(msg);
1974 return sema.failWithOwnedErrorMsg(block, msg);
19731975 }
19741976
19751977 if (has_tag_value) {
......@@ -2316,7 +2318,7 @@ fn zirIndexablePtrLen(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileE
23162318 );
23172319 break :msg msg;
23182320 };
2319 return sema.failWithOwnedErrorMsg(msg);
2321 return sema.failWithOwnedErrorMsg(block, msg);
23202322 }
23212323
23222324 return sema.fieldVal(block, src, object, "len", src);
......@@ -2772,7 +2774,7 @@ fn validateUnionInit(
27722774 try sema.addDeclaredHereNote(msg, union_ty);
27732775 break :msg msg;
27742776 };
2775 return sema.failWithOwnedErrorMsg(msg);
2777 return sema.failWithOwnedErrorMsg(block, msg);
27762778 }
27772779
27782780 if (is_comptime or block.is_comptime) {
......@@ -2889,7 +2891,7 @@ fn validateStructInit(
28892891 try sema.errNote(block, other_field_src, msg, "other field here", .{});
28902892 break :msg msg;
28912893 };
2892 return sema.failWithOwnedErrorMsg(msg);
2894 return sema.failWithOwnedErrorMsg(block, msg);
28932895 }
28942896 found_fields[field_index] = field_ptr;
28952897 }
......@@ -2936,7 +2938,7 @@ fn validateStructInit(
29362938 "struct '{s}' declared here",
29372939 .{fqn},
29382940 );
2939 return sema.failWithOwnedErrorMsg(msg);
2941 return sema.failWithOwnedErrorMsg(block, msg);
29402942 }
29412943
29422944 return;
......@@ -3043,7 +3045,7 @@ fn validateStructInit(
30433045 "struct '{s}' declared here",
30443046 .{fqn},
30453047 );
3046 return sema.failWithOwnedErrorMsg(msg);
3048 return sema.failWithOwnedErrorMsg(block, msg);
30473049 }
30483050
30493051 if (struct_is_comptime) {
......@@ -3215,7 +3217,7 @@ fn failWithBadMemberAccess(
32153217 try sema.addDeclaredHereNote(msg, agg_ty);
32163218 break :msg msg;
32173219 };
3218 return sema.failWithOwnedErrorMsg(msg);
3220 return sema.failWithOwnedErrorMsg(block, msg);
32193221}
32203222
32213223fn failWithBadStructFieldAccess(
......@@ -3241,7 +3243,7 @@ fn failWithBadStructFieldAccess(
32413243 try sema.mod.errNoteNonLazy(struct_obj.srcLoc(), msg, "struct declared here", .{});
32423244 break :msg msg;
32433245 };
3244 return sema.failWithOwnedErrorMsg(msg);
3246 return sema.failWithOwnedErrorMsg(block, msg);
32453247}
32463248
32473249fn failWithBadUnionFieldAccess(
......@@ -3267,7 +3269,7 @@ fn failWithBadUnionFieldAccess(
32673269 try sema.mod.errNoteNonLazy(union_obj.srcLoc(), msg, "union declared here", .{});
32683270 break :msg msg;
32693271 };
3270 return sema.failWithOwnedErrorMsg(msg);
3272 return sema.failWithOwnedErrorMsg(block, msg);
32713273}
32723274
32733275fn addDeclaredHereNote(sema: *Sema, parent: *Module.ErrorMsg, decl_ty: Type) !void {
......@@ -3685,7 +3687,7 @@ fn zirCImport(sema: *Sema, parent_block: *Block, inst: Zir.Inst.Index) CompileEr
36853687 @import("clang.zig").Stage2ErrorMsg.delete(c_import_res.errors.ptr, c_import_res.errors.len);
36863688 break :msg msg;
36873689 };
3688 return sema.failWithOwnedErrorMsg(msg);
3690 return sema.failWithOwnedErrorMsg(parent_block, msg);
36893691 }
36903692 const c_import_pkg = Package.create(
36913693 sema.gpa,
......@@ -4043,7 +4045,7 @@ fn zirSetAlignStack(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErr
40434045 try sema.errNote(block, src, msg, "other instance here", .{});
40444046 break :msg msg;
40454047 };
4046 return sema.failWithOwnedErrorMsg(msg);
4048 return sema.failWithOwnedErrorMsg(block, msg);
40474049 }
40484050 gop.value_ptr.* = .{ .alignment = alignment, .src = src };
40494051}
......@@ -4228,7 +4230,7 @@ fn lookupInNamespace(
42284230 }
42294231 break :msg msg;
42304232 };
4231 return sema.failWithOwnedErrorMsg(msg);
4233 return sema.failWithOwnedErrorMsg(block, msg);
42324234 },
42334235 }
42344236 } else if (namespace.decls.get(ident_name)) |decl| {
......@@ -4642,6 +4644,12 @@ fn analyzeCall(
46424644 _ = sema.analyzeBody(&child_block, fn_info.body) catch |err| switch (err) {
46434645 error.ComptimeReturn => break :result inlining.comptime_result,
46444646 error.ComptimeBreak => unreachable, // Can't break through a fn call.
4647 error.AnalysisFail => {
4648 const err_msg = inlining.err orelse return err;
4649 try sema.errNote(block, call_src, err_msg, "called from here", .{});
4650 if (block.inlining) |some| some.err = err_msg;
4651 return err;
4652 },
46454653 else => |e| return e,
46464654 };
46474655 break :result try sema.analyzeBlockBody(block, call_src, &child_block, merges);
......@@ -5266,7 +5274,7 @@ fn zirMergeErrorSets(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileEr
52665274 try sema.errNote(block, src, msg, "'||' merges error sets; 'or' performs boolean OR", .{});
52675275 break :msg msg;
52685276 };
5269 return sema.failWithOwnedErrorMsg(msg);
5277 return sema.failWithOwnedErrorMsg(block, msg);
52705278 }
52715279 const lhs_ty = try sema.analyzeAsType(block, lhs_src, lhs);
52725280 const rhs_ty = try sema.analyzeAsType(block, rhs_src, rhs);
......@@ -5396,7 +5404,7 @@ fn zirIntToEnum(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
53965404 );
53975405 break :msg msg;
53985406 };
5399 return sema.failWithOwnedErrorMsg(msg);
5407 return sema.failWithOwnedErrorMsg(block, msg);
54005408 }
54015409 return sema.addConstant(dest_ty, int_val);
54025410 }
......@@ -6606,7 +6614,7 @@ fn zirSwitchCond(
66066614 try sema.addDeclaredHereNote(msg, union_ty);
66076615 break :msg msg;
66086616 };
6609 return sema.failWithOwnedErrorMsg(msg);
6617 return sema.failWithOwnedErrorMsg(block, msg);
66106618 };
66116619 return sema.unionToTag(block, enum_ty, operand, src);
66126620 },
......@@ -6686,7 +6694,7 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
66866694 );
66876695 break :msg msg;
66886696 };
6689 return sema.failWithOwnedErrorMsg(msg);
6697 return sema.failWithOwnedErrorMsg(block, msg);
66906698 }
66916699
66926700 // Validate for duplicate items, missing else prong, and invalid range.
......@@ -6778,7 +6786,7 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
67786786 );
67796787 break :msg msg;
67806788 };
6781 return sema.failWithOwnedErrorMsg(msg);
6789 return sema.failWithOwnedErrorMsg(block, msg);
67826790 }
67836791 },
67846792 .under => {
......@@ -6892,7 +6900,7 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
68926900 "error set '{}' declared here",
68936901 .{operand_ty},
68946902 );
6895 return sema.failWithOwnedErrorMsg(msg);
6903 return sema.failWithOwnedErrorMsg(block, msg);
68966904 }
68976905
68986906 if (special_prong == .@"else") {
......@@ -7571,7 +7579,7 @@ fn validateSwitchItemEnum(
75717579 );
75727580 break :msg msg;
75737581 };
7574 return sema.failWithOwnedErrorMsg(msg);
7582 return sema.failWithOwnedErrorMsg(block, msg);
75757583 };
75767584 const maybe_prev_src = seen_fields[field_index];
75777585 seen_fields[field_index] = switch_prong_src;
......@@ -7624,7 +7632,7 @@ fn validateSwitchDupe(
76247632 );
76257633 break :msg msg;
76267634 };
7627 return sema.failWithOwnedErrorMsg(msg);
7635 return sema.failWithOwnedErrorMsg(block, msg);
76287636}
76297637
76307638fn validateSwitchItemBool(
......@@ -7693,7 +7701,7 @@ fn validateSwitchNoRange(
76937701 );
76947702 break :msg msg;
76957703 };
7696 return sema.failWithOwnedErrorMsg(msg);
7704 return sema.failWithOwnedErrorMsg(block, msg);
76977705}
76987706
76997707fn zirHasField(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
......@@ -11569,7 +11577,7 @@ fn zirStructInit(
1156911577 try sema.errNote(block, other_field_src, msg, "other field here", .{});
1157011578 break :msg msg;
1157111579 };
11572 return sema.failWithOwnedErrorMsg(msg);
11580 return sema.failWithOwnedErrorMsg(block, msg);
1157311581 }
1157411582 found_fields[field_index] = item.data.field_type;
1157511583 field_inits[field_index] = sema.resolveInst(item.data.init);
......@@ -11647,7 +11655,7 @@ fn finishStructInit(
1164711655 "struct '{s}' declared here",
1164811656 .{fqn},
1164911657 );
11650 return sema.failWithOwnedErrorMsg(msg);
11658 return sema.failWithOwnedErrorMsg(block, msg);
1165111659 }
1165211660
1165311661 const is_comptime = for (field_inits) |field_init| {
......@@ -12130,7 +12138,7 @@ fn zirTagName(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air
1213012138 try sema.mod.errNoteNonLazy(decl.srcLoc(), msg, "declared here", .{});
1213112139 break :msg msg;
1213212140 };
12133 return sema.failWithOwnedErrorMsg(msg);
12141 return sema.failWithOwnedErrorMsg(block, msg);
1213412142 },
1213512143 else => return sema.fail(block, operand_src, "expected enum or union; found {}", .{
1213612144 operand_ty,
......@@ -12148,7 +12156,7 @@ fn zirTagName(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air
1214812156 try sema.mod.errNoteNonLazy(enum_decl.srcLoc(), msg, "declared here", .{});
1214912157 break :msg msg;
1215012158 };
12151 return sema.failWithOwnedErrorMsg(msg);
12159 return sema.failWithOwnedErrorMsg(block, msg);
1215212160 };
1215312161 const field_name = enum_ty.enumFieldName(field_index);
1215412162 return sema.addStrLit(block, field_name);
......@@ -12624,7 +12632,7 @@ fn zirTruncate(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
1262412632 });
1262512633 break :msg msg;
1262612634 };
12627 return sema.failWithOwnedErrorMsg(msg);
12635 return sema.failWithOwnedErrorMsg(block, msg);
1262812636 }
1262912637 }
1263012638
......@@ -12884,7 +12892,7 @@ fn checkPtrOperand(
1288412892
1288512893 break :msg msg;
1288612894 };
12887 return sema.failWithOwnedErrorMsg(msg);
12895 return sema.failWithOwnedErrorMsg(block, msg);
1288812896 },
1288912897 .Optional => if (ty.isPtrLikeOptional()) return,
1289012898 else => {},
......@@ -12914,7 +12922,7 @@ fn checkPtrType(
1291412922
1291512923 break :msg msg;
1291612924 };
12917 return sema.failWithOwnedErrorMsg(msg);
12925 return sema.failWithOwnedErrorMsg(block, msg);
1291812926 },
1291912927 .Optional => if (ty.isPtrLikeOptional()) return,
1292012928 else => {},
......@@ -13037,7 +13045,7 @@ fn checkComptimeVarStore(
1303713045 try sema.errNote(block, cond_src, msg, "runtime condition here", .{});
1303813046 break :msg msg;
1303913047 };
13040 return sema.failWithOwnedErrorMsg(msg);
13048 return sema.failWithOwnedErrorMsg(block, msg);
1304113049 }
1304213050 if (block.runtime_loop) |loop_src| {
1304313051 const msg = msg: {
......@@ -13046,7 +13054,7 @@ fn checkComptimeVarStore(
1304613054 try sema.errNote(block, loop_src, msg, "non-inline loop here", .{});
1304713055 break :msg msg;
1304813056 };
13049 return sema.failWithOwnedErrorMsg(msg);
13057 return sema.failWithOwnedErrorMsg(block, msg);
1305013058 }
1305113059 unreachable;
1305213060 }
......@@ -13114,7 +13122,7 @@ fn checkSimdBinOp(
1311413122 try sema.errNote(block, rhs_src, msg, "length {d} here", .{rhs_len});
1311513123 break :msg msg;
1311613124 };
13117 return sema.failWithOwnedErrorMsg(msg);
13125 return sema.failWithOwnedErrorMsg(block, msg);
1311813126 }
1311913127 vec_len = try sema.usizeCast(block, lhs_src, lhs_len);
1312013128 } else if (lhs_zig_ty_tag == .Vector or rhs_zig_ty_tag == .Vector) {
......@@ -13132,7 +13140,7 @@ fn checkSimdBinOp(
1313213140 }
1313313141 break :msg msg;
1313413142 };
13135 return sema.failWithOwnedErrorMsg(msg);
13143 return sema.failWithOwnedErrorMsg(block, msg);
1313613144 }
1313713145 const result_ty = try sema.resolvePeerTypes(block, src, &.{ uncasted_lhs, uncasted_rhs }, .{
1313813146 .override = &[_]LazySrcLoc{ lhs_src, rhs_src },
......@@ -14263,7 +14271,7 @@ fn validateVarType(
1426314271
1426414272 break :msg msg;
1426514273 };
14266 return sema.failWithOwnedErrorMsg(msg);
14274 return sema.failWithOwnedErrorMsg(block, msg);
1426714275}
1426814276
1426914277fn explainWhyTypeIsComptime(
......@@ -15037,7 +15045,7 @@ fn namespaceLookup(
1503715045 try sema.mod.errNoteNonLazy(decl.srcLoc(), msg, "declared here", .{});
1503815046 break :msg msg;
1503915047 };
15040 return sema.failWithOwnedErrorMsg(msg);
15048 return sema.failWithOwnedErrorMsg(block, msg);
1504115049 }
1504215050 return decl;
1504315051 }
......@@ -15961,7 +15969,7 @@ fn coerce(
1596115969 );
1596215970 break :msg msg;
1596315971 };
15964 return sema.failWithOwnedErrorMsg(msg);
15972 return sema.failWithOwnedErrorMsg(block, msg);
1596515973 };
1596615974 return sema.addConstant(
1596715975 dest_ty,
......@@ -17034,7 +17042,7 @@ fn coerceEnumToUnion(
1703417042 try sema.addDeclaredHereNote(msg, union_ty);
1703517043 break :msg msg;
1703617044 };
17037 return sema.failWithOwnedErrorMsg(msg);
17045 return sema.failWithOwnedErrorMsg(block, msg);
1703817046 };
1703917047
1704017048 const enum_tag = try sema.coerce(block, tag_ty, inst, inst_src);
......@@ -17049,7 +17057,7 @@ fn coerceEnumToUnion(
1704917057 try sema.addDeclaredHereNote(msg, union_ty);
1705017058 break :msg msg;
1705117059 };
17052 return sema.failWithOwnedErrorMsg(msg);
17060 return sema.failWithOwnedErrorMsg(block, msg);
1705317061 };
1705417062 const field = union_obj.fields.values()[field_index];
1705517063 const field_ty = try sema.resolveTypeFields(block, inst_src, field.ty);
......@@ -17064,7 +17072,7 @@ fn coerceEnumToUnion(
1706417072 try sema.addDeclaredHereNote(msg, union_ty);
1706517073 break :msg msg;
1706617074 };
17067 return sema.failWithOwnedErrorMsg(msg);
17075 return sema.failWithOwnedErrorMsg(block, msg);
1706817076 };
1706917077
1707017078 return sema.addConstant(union_ty, try Value.Tag.@"union".create(sema.arena, .{
......@@ -17084,7 +17092,7 @@ fn coerceEnumToUnion(
1708417092 try sema.addDeclaredHereNote(msg, tag_ty);
1708517093 break :msg msg;
1708617094 };
17087 return sema.failWithOwnedErrorMsg(msg);
17095 return sema.failWithOwnedErrorMsg(block, msg);
1708817096 }
1708917097
1709017098 // If the union has all fields 0 bits, the union value is just the enum value.
......@@ -17102,7 +17110,7 @@ fn coerceEnumToUnion(
1710217110 try sema.addDeclaredHereNote(msg, union_ty);
1710317111 break :msg msg;
1710417112 };
17105 return sema.failWithOwnedErrorMsg(msg);
17113 return sema.failWithOwnedErrorMsg(block, msg);
1710617114}
1710717115
1710817116fn coerceAnonStructToUnion(
......@@ -17131,7 +17139,7 @@ fn coerceAnonStructToUnion(
1713117139 try sema.addDeclaredHereNote(msg, union_ty);
1713217140 break :msg msg;
1713317141 };
17134 return sema.failWithOwnedErrorMsg(msg);
17142 return sema.failWithOwnedErrorMsg(block, msg);
1713517143 }
1713617144
1713717145 const field_name = anon_struct.names[0];
......@@ -17176,7 +17184,7 @@ fn coerceArrayLike(
1717617184 try sema.errNote(block, inst_src, msg, "source has length {d}", .{inst_len});
1717717185 break :msg msg;
1717817186 };
17179 return sema.failWithOwnedErrorMsg(msg);
17187 return sema.failWithOwnedErrorMsg(block, msg);
1718017188 }
1718117189
1718217190 const target = sema.mod.getTarget();
......@@ -17248,7 +17256,7 @@ fn coerceTupleToArray(
1724817256 try sema.errNote(block, inst_src, msg, "source has length {d}", .{inst_len});
1724917257 break :msg msg;
1725017258 };
17251 return sema.failWithOwnedErrorMsg(msg);
17259 return sema.failWithOwnedErrorMsg(block, msg);
1725217260 }
1725317261
1725417262 const element_vals = try sema.arena.alloc(Value, dest_len);
......@@ -18446,7 +18454,7 @@ fn resolvePeerTypes(
1844618454
1844718455 break :msg msg;
1844818456 };
18449 return sema.failWithOwnedErrorMsg(msg);
18457 return sema.failWithOwnedErrorMsg(block, msg);
1845018458 }
1845118459
1845218460 const chosen_ty = sema.typeOf(chosen);
test/stage2/x86_64.zig+4-1
......@@ -1183,7 +1183,10 @@ pub fn addCases(ctx: *TestContext) !void {
11831183 \\ if (a == 10) @compileError("bad");
11841184 \\ return a + b + c;
11851185 \\}
1186 , &[_][]const u8{":8:18: error: bad"});
1186 , &[_][]const u8{
1187 ":8:18: error: bad",
1188 ":3:18: note: called from here",
1189 });
11871190
11881191 case.addCompareOutput(
11891192 \\pub fn main() void {