motiejus/zig
1
Fork 0
Code Releases Activity

zig cc: support both ubsan and tsan at the same time

Browse Source
This commit is contained in:
Andrew Kelley
2020-12-22 20:45:37 -07:00
parent 3002856a7f
commit a4b134746f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Compilation.zig
View File

@@ -2076,10 +2076,6 @@ pub fn addCCArgs(
try argv.append("-ffunction-sections");
}
if (comp.bin_file.options.tsan) {
try argv.append("-fsanitize=thread");
}
try argv.ensureCapacity(argv.items.len + comp.bin_file.options.framework_dirs.len * 2);
for (comp.bin_file.options.framework_dirs) |framework_dir| {
argv.appendAssumeCapacity("-iframework");
@@ -2203,9 +2199,14 @@ pub fn addCCArgs(
try argv.append("-fomit-frame-pointer");
}
if (comp.sanitize_c) {
if (comp.sanitize_c and !comp.bin_file.options.tsan) {
try argv.append("-fsanitize=undefined");
try argv.append("-fsanitize-trap=undefined");
} else if (comp.sanitize_c and comp.bin_file.options.tsan) {
try argv.append("-fsanitize=undefined,thread");
try argv.append("-fsanitize-trap=undefined");
} else if (!comp.sanitize_c and comp.bin_file.options.tsan) {
try argv.append("-fsanitize=thread");
}
switch (comp.bin_file.options.optimize_mode) {