diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-08 10:34:45 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-08 10:34:45 -0500 |
| commit | 5a8d87f5042b5ab86de7c72df4ce84a314878e40 (patch) | |
| tree | d9a8e14011994c5ebdf4525ea5c5b647aae91a6e /std/special/panic.zig | |
| parent | 38658a597bc22697c2038c21bdec9f04c9973eb8 (diff) | |
| parent | 598170756cd91b6f300921d256baa72141ec3098 (diff) | |
| download | zig-5a8d87f5042b5ab86de7c72df4ce84a314878e40.tar.gz zig-5a8d87f5042b5ab86de7c72df4ce84a314878e40.zip | |
Merge branch 'master' into llvm6
Diffstat (limited to 'std/special/panic.zig')
| -rw-r--r-- | std/special/panic.zig | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/std/special/panic.zig b/std/special/panic.zig index 78117a5366..03c2586739 100644 --- a/std/special/panic.zig +++ b/std/special/panic.zig @@ -6,9 +6,13 @@ const builtin = @import("builtin"); pub coldcc fn panic(msg: []const u8) -> noreturn { - if (builtin.os == builtin.Os.freestanding) { - while (true) {} - } else { - @import("std").debug.panic("{}", msg); + switch (builtin.os) { + // TODO: fix panic in zen. + builtin.Os.freestanding, builtin.Os.zen => { + while (true) {} + }, + else => { + @import("std").debug.panic("{}", msg); + }, } } |