authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-08-26 19:42:56-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-08-28 17:43:37-04:00
log7a251c4cb8082d080e23fb86fe20be6bf4c745a4
tree9a5ec30eed4af6f82d459ad76dd982e009e130f7
parent232077dcf90a19316261ac5745a2a947e538c3f5

Sema: revert reference trace changes that are no longer needed

4 files changed, 93 insertions(+), 85 deletions(-)

src/Compilation.zig+24-23
......@@ -2858,51 +2858,52 @@ pub fn addModuleErrorMsg(mod: *Module, eb: *ErrorBundle.Wip, module_err_msg: Mod
28582858 var ref_traces: std.ArrayListUnmanaged(ErrorBundle.ReferenceTrace) = .{};
28592859 defer ref_traces.deinit(gpa);
28602860
2861 for (module_err_msg.reference_trace) |module_reference| {
2862 if (module_reference.hidden != 0) {
2863 try ref_traces.append(gpa, .{
2864 .decl_name = module_reference.hidden,
2865 .src_loc = .none,
2866 });
2867 break;
2868 } else if (module_reference.decl == .none) {
2869 try ref_traces.append(gpa, .{
2870 .decl_name = 0,
2871 .src_loc = .none,
2872 });
2873 break;
2861 const remaining_references: ?u32 = remaining: {
2862 if (mod.comp.reference_trace) |_| {
2863 if (module_err_msg.hidden_references > 0) break :remaining module_err_msg.hidden_references;
2864 } else {
2865 if (module_err_msg.reference_trace.len > 0) break :remaining 0;
28742866 }
2867 break :remaining null;
2868 };
2869 try ref_traces.ensureTotalCapacityPrecise(gpa, module_err_msg.reference_trace.len +
2870 @intFromBool(remaining_references != null));
2871
2872 for (module_err_msg.reference_trace) |module_reference| {
28752873 const source = try module_reference.src_loc.file_scope.getSource(gpa);
28762874 const span = try module_reference.src_loc.span(gpa);
28772875 const loc = std.zig.findLineColumn(source.bytes, span.main);
28782876 const rt_file_path = try module_reference.src_loc.file_scope.fullPath(gpa);
28792877 defer gpa.free(rt_file_path);
2880 try ref_traces.append(gpa, .{
2881 .decl_name = try eb.addString(ip.stringToSliceUnwrap(module_reference.decl).?),
2878 ref_traces.appendAssumeCapacity(.{
2879 .decl_name = try eb.addString(ip.stringToSlice(module_reference.decl)),
28822880 .src_loc = try eb.addSourceLocation(.{
28832881 .src_path = try eb.addString(rt_file_path),
28842882 .span_start = span.start,
28852883 .span_main = span.main,
28862884 .span_end = span.end,
2887 .line = @as(u32, @intCast(loc.line)),
2888 .column = @as(u32, @intCast(loc.column)),
2885 .line = @intCast(loc.line),
2886 .column = @intCast(loc.column),
28892887 .source_line = 0,
28902888 }),
28912889 });
28922890 }
2891 if (remaining_references) |remaining| ref_traces.appendAssumeCapacity(
2892 .{ .decl_name = remaining, .src_loc = .none },
2893 );
28932894
28942895 const src_loc = try eb.addSourceLocation(.{
28952896 .src_path = try eb.addString(file_path),
28962897 .span_start = err_span.start,
28972898 .span_main = err_span.main,
28982899 .span_end = err_span.end,
2899 .line = @as(u32, @intCast(err_loc.line)),
2900 .column = @as(u32, @intCast(err_loc.column)),
2900 .line = @intCast(err_loc.line),
2901 .column = @intCast(err_loc.column),
29012902 .source_line = if (module_err_msg.src_loc.lazy == .entire_file)
29022903 0
29032904 else
29042905 try eb.addString(err_loc.source_line),
2905 .reference_trace_len = @as(u32, @intCast(ref_traces.items.len)),
2906 .reference_trace_len = @intCast(ref_traces.items.len),
29062907 });
29072908
29082909 for (ref_traces.items) |rt| {
......@@ -2928,8 +2929,8 @@ pub fn addModuleErrorMsg(mod: *Module, eb: *ErrorBundle.Wip, module_err_msg: Mod
29282929 .span_start = span.start,
29292930 .span_main = span.main,
29302931 .span_end = span.end,
2931 .line = @as(u32, @intCast(loc.line)),
2932 .column = @as(u32, @intCast(loc.column)),
2932 .line = @intCast(loc.line),
2933 .column = @intCast(loc.column),
29332934 .source_line = if (err_loc.eql(loc)) 0 else try eb.addString(loc.source_line),
29342935 }),
29352936 }, .{ .eb = eb });
......@@ -2938,7 +2939,7 @@ pub fn addModuleErrorMsg(mod: *Module, eb: *ErrorBundle.Wip, module_err_msg: Mod
29382939 }
29392940 }
29402941
2941 const notes_len = @as(u32, @intCast(notes.entries.len));
2942 const notes_len: u32 = @intCast(notes.entries.len);
29422943
29432944 try eb.addRootErrorMessage(.{
29442945 .msg = try eb.addString(module_err_msg.msg),
src/Module.zig+2-2
......@@ -1519,11 +1519,11 @@ pub const ErrorMsg = struct {
15191519 msg: []const u8,
15201520 notes: []ErrorMsg = &.{},
15211521 reference_trace: []Trace = &.{},
1522 hidden_references: u32 = 0,
15221523
15231524 pub const Trace = struct {
1524 decl: InternPool.OptionalNullTerminatedString,
1525 decl: InternPool.NullTerminatedString,
15251526 src_loc: SrcLoc,
1526 hidden: u32 = 0,
15271527 };
15281528
15291529 pub fn create(
src/Sema.zig+50-60
......@@ -2396,80 +2396,69 @@ fn failWithOwnedErrorMsg(sema: *Sema, block: ?*Block, err_msg: *Module.ErrorMsg)
23962396 const gpa = sema.gpa;
23972397 const mod = sema.mod;
23982398
2399 if (crash_report.is_enabled and mod.comp.debug_compile_errors) {
2400 if (err_msg.src_loc.lazy == .unneeded) return error.NeededSourceLocation;
2401 var wip_errors: std.zig.ErrorBundle.Wip = undefined;
2402 wip_errors.init(gpa) catch unreachable;
2403 Compilation.addModuleErrorMsg(mod, &wip_errors, err_msg.*) catch unreachable;
2404 std.debug.print("compile error during Sema:\n", .{});
2405 var error_bundle = wip_errors.toOwnedBundle("") catch unreachable;
2406 error_bundle.renderToStdErr(.{ .ttyconf = .no_color });
2407 crash_report.compilerPanic("unexpected compile error occurred", null, null);
2408 }
2409
24102399 ref: {
24112400 errdefer err_msg.destroy(gpa);
2412 if (err_msg.src_loc.lazy == .unneeded) {
2413 return error.NeededSourceLocation;
2401 if (err_msg.src_loc.lazy == .unneeded) return error.NeededSourceLocation;
2402
2403 if (crash_report.is_enabled and mod.comp.debug_compile_errors) {
2404 var wip_errors: std.zig.ErrorBundle.Wip = undefined;
2405 wip_errors.init(gpa) catch unreachable;
2406 Compilation.addModuleErrorMsg(mod, &wip_errors, err_msg.*) catch unreachable;
2407 std.debug.print("compile error during Sema:\n", .{});
2408 var error_bundle = wip_errors.toOwnedBundle("") catch unreachable;
2409 error_bundle.renderToStdErr(.{ .ttyconf = .no_color });
2410 crash_report.compilerPanic("unexpected compile error occurred", null, null);
24142411 }
2412
24152413 try mod.failed_decls.ensureUnusedCapacity(gpa, 1);
24162414 try mod.failed_files.ensureUnusedCapacity(gpa, 1);
24172415
2418 var func_index: InternPool.Index = .none;
24192416 if (block) |start_block| {
24202417 var block_it = start_block;
24212418 while (block_it.inlining) |inlining| {
2422 func_index = inlining.func;
2419 try sema.errNote(
2420 inlining.call_block,
2421 inlining.call_src,
2422 err_msg,
2423 "called from here",
2424 .{},
2425 );
24232426 block_it = inlining.call_block;
2424 try sema.errNote(block_it, inlining.call_src, err_msg, "called from here", .{});
24252427 }
2426 }
24272428
2428 const max_references = blk: {
2429 if (mod.comp.reference_trace) |num| break :blk num;
2430 // Do not add multiple traces without explicit request.
2431 if (mod.failed_decls.count() != 0) break :ref;
2432 break :blk default_reference_trace_len;
2433 };
2429 const max_references = refs: {
2430 if (mod.comp.reference_trace) |num| break :refs num;
2431 // Do not add multiple traces without explicit request.
2432 if (mod.failed_decls.count() > 0) break :ref;
2433 break :refs default_reference_trace_len;
2434 };
24342435
2435 var referenced_by = if (sema.owner_func_index != .none)
2436 mod.funcOwnerDeclIndex(sema.owner_func_index)
2437 else
2438 sema.owner_decl_index;
2439 var reference_stack = std.ArrayList(Module.ErrorMsg.Trace).init(gpa);
2440 defer reference_stack.deinit();
2441
2442 // Avoid infinite loops.
2443 var seen = std.AutoHashMap(Decl.Index, void).init(gpa);
2444 defer seen.deinit();
2445
2446 var cur_reference_trace: u32 = 0;
2447 while (sema.mod.reference_table.get(referenced_by)) |ref| : (cur_reference_trace += 1) {
2448 const gop = try seen.getOrPut(ref.referencer);
2449 if (gop.found_existing) break;
2450 if (cur_reference_trace < max_references) {
2451 const decl = sema.mod.declPtr(ref.referencer);
2452 try reference_stack.append(.{
2453 .decl = decl.name.toOptional(),
2454 .src_loc = ref.src.toSrcLoc(decl, mod),
2455 });
2436 var referenced_by = if (sema.owner_func_index != .none)
2437 mod.funcOwnerDeclIndex(sema.owner_func_index)
2438 else
2439 sema.owner_decl_index;
2440 var reference_stack = std.ArrayList(Module.ErrorMsg.Trace).init(gpa);
2441 defer reference_stack.deinit();
2442
2443 // Avoid infinite loops.
2444 var seen = std.AutoHashMap(Decl.Index, void).init(gpa);
2445 defer seen.deinit();
2446
2447 while (mod.reference_table.get(referenced_by)) |ref| {
2448 const gop = try seen.getOrPut(ref.referencer);
2449 if (gop.found_existing) break;
2450 if (reference_stack.items.len < max_references) {
2451 const decl = mod.declPtr(ref.referencer);
2452 try reference_stack.append(.{
2453 .decl = decl.name,
2454 .src_loc = ref.src.toSrcLoc(decl, mod),
2455 });
2456 }
2457 referenced_by = ref.referencer;
24562458 }
2457 referenced_by = ref.referencer;
2458 }
2459 if (sema.mod.comp.reference_trace == null and cur_reference_trace > 0) {
2460 try reference_stack.append(.{
2461 .decl = .none,
2462 .src_loc = undefined,
2463 .hidden = 0,
2464 });
2465 } else if (cur_reference_trace > max_references) {
2466 try reference_stack.append(.{
2467 .decl = undefined,
2468 .src_loc = undefined,
2469 .hidden = cur_reference_trace - max_references,
2470 });
2459 err_msg.reference_trace = try reference_stack.toOwnedSlice();
2460 err_msg.hidden_references = @intCast(seen.count() -| max_references);
24712461 }
2472 err_msg.reference_trace = try reference_stack.toOwnedSlice();
24732462 }
24742463 const ip = &mod.intern_pool;
24752464 if (sema.owner_func_index != .none) {
......@@ -7399,7 +7388,8 @@ fn analyzeCall(
73997388 var block_it = block;
74007389 while (block_it.inlining) |parent_inlining| {
74017390 if (!parent_inlining.has_comptime_args and parent_inlining.func == module_fn_index) {
7402 return sema.fail(block, call_src, "inline call is recursive", .{});
7391 const err_msg = try sema.errMsg(block, call_src, "inline call is recursive", .{});
7392 return sema.failWithOwnedErrorMsg(null, err_msg);
74037393 }
74047394 block_it = parent_inlining.call_block;
74057395 }
test/cases/compile_errors/recursive_inline_fn.zig+17
......@@ -11,8 +11,25 @@ pub export fn entry() void {
1111 _ = foo(x) == 20;
1212}
1313
14inline fn first() void {
15 second();
16}
17
18inline fn second() void {
19 third();
20}
21
22inline fn third() void {
23 first();
24}
25
26pub export fn entry2() void {
27 first();
28}
29
1430// error
1531// backend=stage2
1632// target=native
1733//
1834// :5:27: error: inline call is recursive
35// :23:10: error: inline call is recursive