diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-11-25 18:46:35 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-11-25 18:46:35 -0500 |
| commit | 80f79cc9e8ed02f631c9d59f68e5f20a909e85fc (patch) | |
| tree | ba8da3ef0611a547fe67c61ed2d42d4ea67e6d2e /lib/std/debug.zig | |
| parent | cb38bd0a1436bd18de8ed57c45ffc890c8ddfb78 (diff) | |
| parent | 4261fa3c49be715355c9623102bad0bf93d537a3 (diff) | |
| download | zig-80f79cc9e8ed02f631c9d59f68e5f20a909e85fc.tar.gz zig-80f79cc9e8ed02f631c9d59f68e5f20a909e85fc.zip | |
Merge branch 'fengb-wasi-run-tests'
closes #3730
Diffstat (limited to 'lib/std/debug.zig')
| -rw-r--r-- | lib/std/debug.zig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/std/debug.zig b/lib/std/debug.zig index 9df7370ad0..226574b3dd 100644 --- a/lib/std/debug.zig +++ b/lib/std/debug.zig @@ -213,7 +213,8 @@ pub fn assert(ok: bool) void { pub fn panic(comptime format: []const u8, args: ...) noreturn { @setCold(true); - const first_trace_addr = @returnAddress(); + // TODO: remove conditional once wasi / LLVM defines __builtin_return_address + const first_trace_addr = if (builtin.os == .wasi) null else @returnAddress(); panicExtra(null, first_trace_addr, format, args); } |