aboutsummaryrefslogtreecommitdiff
path: root/src/Compilation.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2024-01-10 15:08:49 -0800
committerGitHub <noreply@github.com>2024-01-10 15:08:49 -0800
commitdf6aed0fc3a85285ad9bf15c942a66255c2b0b31 (patch)
tree6b57572f4956e89c7c36b618187038fb6346521a /src/Compilation.zig
parentaafff258973fb58f1a964eb050d5602ed8b9f60c (diff)
parent71e7bef2a2731dbffc6a3673538bb4c678be4757 (diff)
downloadzig-df6aed0fc3a85285ad9bf15c942a66255c2b0b31.tar.gz
zig-df6aed0fc3a85285ad9bf15c942a66255c2b0b31.zip
Merge pull request #18505 from ziglang/tsan
TSAN: update to LLVM 17.0.6
Diffstat (limited to 'src/Compilation.zig')
-rw-r--r--src/Compilation.zig9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig
index 9dd45d8ced..fdc7d08e98 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -3759,13 +3759,14 @@ fn processOneJob(comp: *Compilation, job: Job, prog_node: *std.Progress.Node) !v
const named_frame = tracy.namedFrame("libtsan");
defer named_frame.end();
- libtsan.buildTsan(comp, prog_node) catch |err| {
- // TODO Surface more error details.
- comp.lockAndSetMiscFailure(
+ libtsan.buildTsan(comp, prog_node) catch |err| switch (err) {
+ error.OutOfMemory => return error.OutOfMemory,
+ error.SubCompilationFailed => return, // error reported already
+ else => comp.lockAndSetMiscFailure(
.libtsan,
"unable to build TSAN library: {s}",
.{@errorName(err)},
- );
+ ),
};
},
.wasi_libc_crt_file => |crt_file| {