authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-12-21 17:06:02-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-12-23 22:15:11-08:00
logfd0c324cb05d0d30f8ca5ae44f6db5072975b125
tree34402496b80aec11f1685c0c4fd86056242922d0
parentdebf3075942a0a8aa4078ffefc2f1201dd92d72b

std.debug: fix simple_panic

2 files changed, 2 insertions(+), 6 deletions(-)

lib/std/debug.zig+1-4
...@@ -489,10 +489,7 @@ const use_trap_panic = switch (builtin.zig_backend) {...@@ -489,10 +489,7 @@ const use_trap_panic = switch (builtin.zig_backend) {
489};489};
490490
491/// Dumps a stack trace to standard error, then aborts.491/// Dumps a stack trace to standard error, then aborts.
492pub fn defaultPanic(492pub fn defaultPanic(msg: []const u8, first_trace_addr: ?usize) noreturn {
493 msg: []const u8,
494 first_trace_addr: ?usize,
495) noreturn {
496 @branchHint(.cold);493 @branchHint(.cold);
497494
498 if (use_trap_panic) @trap();495 if (use_trap_panic) @trap();
lib/std/debug/simple_panic.zig+1-2
...@@ -14,9 +14,8 @@ const std = @import("../std.zig");...@@ -14,9 +14,8 @@ const std = @import("../std.zig");
14pub fn call(msg: []const u8, ra: ?usize) noreturn {14pub fn call(msg: []const u8, ra: ?usize) noreturn {
15 @branchHint(.cold);15 @branchHint(.cold);
16 _ = ra;16 _ = ra;
17 const stderr_writer = std.debug.lockStderr(&.{}, null).terminal().writer;17 const stderr_writer = &std.debug.lockStderr(&.{}).file_writer.interface;
18 stderr_writer.writeAll(msg) catch {};18 stderr_writer.writeAll(msg) catch {};
19 stderr_writer.flush(msg) catch {};
20 @trap();19 @trap();
21}20}
2221