Merge branch 'wasi-run-tests' of https://github.com/fengb/zig into fengb-wasi-run-tests

This commit is contained in:
Andrew Kelley
2019-11-25 17:53:26 -05:00
7 changed files with 168 additions and 101 deletions

View File

@@ -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);
}