Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-02-16 09:30:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

store error trace and defer printing

Browse Source
This commit is contained in:
Parzival-3141 2024-08-26 21:08:37 -04:00
parent 0c5b9cb0c0
commit a49d1827fe
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/compiler/build_runner.zig
View File

@ -1216,6 +1216,10 @@ pub fn printErrorMessages(
try stderr.writeAll(msg);
try stderr.writeAll("\n");
}
if (failing_step.result_error_trace) |trace| {
try trace.format("", .{}, stderr.writer());
}
}
fn steps(builder: *std.Build, out_stream: anytype) !void {

37
lib/std/Build/Step.zig
View File

@ -41,6 +41,7 @@ max_rss: usize,
result_error_msgs: std.ArrayListUnmanaged([]const u8),
result_error_bundle: std.zig.ErrorBundle,
result_error_trace: ?*std.builtin.StackTrace,
result_stderr: []const u8,
result_cached: bool,
result_duration_ns: ?u64,
@ -214,6 +215,7 @@ pub fn init(options: StepOptions) Step {
},
.result_error_msgs = .{},
.result_error_bundle = std.zig.ErrorBundle.empty,
.result_error_trace = null,
.result_stderr = "",
.result_cached = false,
.result_duration_ns = null,
@ -228,31 +230,16 @@ pub fn init(options: StepOptions) Step {
pub fn make(s: *Step, options: MakeOptions) error{ MakeFailed, MakeSkipped }!void {
const arena = s.owner.allocator;
s.makeFn(s, options) catch |err| switch (err) {
error.MakeFailed => return error.MakeFailed,
error.MakeSkipped => return error.MakeSkipped,
else => {
var msg_buffer = arena.alloc(u8, 4096) catch @panic("OOM");
var stream = std.io.fixedBufferStream(msg_buffer);
const writer = stream.writer();
writer.writeAll("step failed with error ") catch unreachable;
writer.writeAll(@errorName(err)) catch @panic("msg_buffer OOM");
if (@errorReturnTrace()) |trace| {
writer.writeAll(":") catch @panic("msg_buffer OOM");
trace.format("", .{}, writer) catch {
// Assumes trace.format has written everything up until failure
const overrun_msg = ".... errorReturnTrace exceeds buffer size!";
for (msg_buffer[stream.pos - overrun_msg.len .. stream.pos], 0..) |*value, i| {
value.* = overrun_msg[i];
}
};
}
_ = arena.resize(msg_buffer, stream.pos);
s.result_error_msgs.append(arena, msg_buffer[0..stream.pos]) catch @panic("OOM");
return error.MakeFailed;
},
s.makeFn(s, options) catch |err| {
switch (err) {
error.MakeFailed => return error.MakeFailed,
error.MakeSkipped => return error.MakeSkipped,
else => {
s.result_error_trace = @errorReturnTrace();
s.addError("this step's make function failed with error {s}:", .{@errorName(err)}) catch @panic("OOM");
return error.MakeFailed;
},
}
};
if (!s.test_results.isSuccess()) {