Skip to content

Commit 7218218

Browse files
mluggalexrp
authored andcommitted
build runner: don't incorrectly omit reference traces
It's incorrect to ever set `include_reference_trace` here, because the compiler has already given or not given reference traces depending on the `-freference-trace` option propagated to the compiler process by `std.Build.Step.Compile`. Perhaps in future we could make the compiler always return the reference trace when communicating over the compiler protocol; that'd be more versatile than the current behavior, because the build runner could, for instance, show a reference trace on-demand without having to even invoke the compiler. That seems really useful, since the reference trace is *often* unnecessary noise, but *sometimes* essential. However, we don't live in that world right now, so passing the option here doesn't make sense. Resolves: #23415
1 parent f377ea1 commit 7218218

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

lib/compiler/build_runner.zig

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ fn runStepNames(
740740
if (run.prominent_compile_errors and total_compile_errors > 0) {
741741
for (step_stack.keys()) |s| {
742742
if (s.result_error_bundle.errorMessageCount() > 0) {
743-
s.result_error_bundle.renderToStdErr(.{ .ttyconf = ttyconf, .include_reference_trace = (b.reference_trace orelse 0) > 0 });
743+
s.result_error_bundle.renderToStdErr(.{ .ttyconf = ttyconf });
744744
}
745745
}
746746

@@ -1119,11 +1119,7 @@ fn workerMakeOneStep(
11191119
defer std.debug.unlockStdErr();
11201120

11211121
const gpa = b.allocator;
1122-
const options: std.zig.ErrorBundle.RenderOptions = .{
1123-
.ttyconf = run.ttyconf,
1124-
.include_reference_trace = (b.reference_trace orelse 0) > 0,
1125-
};
1126-
printErrorMessages(gpa, s, options, run.stderr, run.prominent_compile_errors) catch {};
1122+
printErrorMessages(gpa, s, .{ .ttyconf = run.ttyconf }, run.stderr, run.prominent_compile_errors) catch {};
11271123
}
11281124

11291125
handle_result: {

0 commit comments

Comments
 (0)