diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-03-09 22:21:13 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-03-10 01:38:40 -0500 |
| commit | 3b3649b86f74d08013b669a6a4eac573f8d7fa23 (patch) | |
| tree | 751c3abd5d2f5be50b3305b6489ee36297b69db6 /std/special/panic.zig | |
| parent | 60b2031831320186f3920d63cfa35bda40930450 (diff) | |
| download | zig-3b3649b86f74d08013b669a6a4eac573f8d7fa23.tar.gz zig-3b3649b86f74d08013b669a6a4eac573f8d7fa23.zip | |
refactor stack trace code to remove global state
Diffstat (limited to 'std/special/panic.zig')
| -rw-r--r-- | std/special/panic.zig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/std/special/panic.zig b/std/special/panic.zig index 4459382f9b..8f933ddd97 100644 --- a/std/special/panic.zig +++ b/std/special/panic.zig @@ -14,11 +14,8 @@ pub fn panic(msg: []const u8, error_return_trace: ?&builtin.StackTrace) noreturn while (true) {} }, else => { - std.debug.stack_trace_start_address = @ptrToInt(@returnAddress()); - if (error_return_trace) |trace| { - std.debug.panicWithTrace(trace, "{}", msg); - } - std.debug.panic("{}", msg); + const first_trace_addr = @ptrToInt(@returnAddress()); + std.debug.panicExtra(error_return_trace, first_trace_addr, "{}", msg); }, } } |