Skip to content

Commit 9beb9a1

Browse files
committed
address review comments
1 parent 041c5a9 commit 9beb9a1

3 files changed

Lines changed: 13 additions & 15 deletions

File tree

sanitizers/features/BUILD.bazel

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
load("@rules_cc//cc/toolchains:args.bzl", "cc_args")
1515
load("@rules_cc//cc/toolchains:feature.bzl", "cc_feature")
1616

17-
# Link flags for ASan + UBSan + LSan combined
17+
# Compile + link flags for ASan + UBSan + LSan combined
1818
cc_args(
19-
name = "asan_ubsan_lsan_link_args",
19+
name = "asan_ubsan_lsan_args",
2020
actions = [
21-
"@rules_cc//cc/toolchains/actions:cpp_link_executable",
22-
"@rules_cc//cc/toolchains/actions:cpp_link_dynamic_library",
23-
"@rules_cc//cc/toolchains/actions:cpp_link_nodeps_dynamic_library",
21+
"@rules_cc//cc/toolchains/actions:compile_actions",
22+
"@rules_cc//cc/toolchains/actions:link_actions",
2423
],
2524
args = [
2625
"-fsanitize=undefined,address,leak",
@@ -32,17 +31,16 @@ cc_args(
3231
cc_feature(
3332
name = "asan_ubsan_lsan_link",
3433
feature_name = "asan_ubsan_lsan_link",
35-
args = [":asan_ubsan_lsan_link_args"],
34+
args = [":asan_ubsan_lsan_args"],
3635
visibility = ["//visibility:public"],
3736
)
3837

39-
# Link flags for ThreadSanitizer
38+
# Compile + link flags for ThreadSanitizer
4039
cc_args(
41-
name = "tsan_link_args",
40+
name = "tsan_args",
4241
actions = [
43-
"@rules_cc//cc/toolchains/actions:cpp_link_executable",
44-
"@rules_cc//cc/toolchains/actions:cpp_link_dynamic_library",
45-
"@rules_cc//cc/toolchains/actions:cpp_link_nodeps_dynamic_library",
42+
"@rules_cc//cc/toolchains/actions:compile_actions",
43+
"@rules_cc//cc/toolchains/actions:link_actions",
4644
],
4745
args = [
4846
"-fsanitize=thread",
@@ -54,6 +52,6 @@ cc_args(
5452
cc_feature(
5553
name = "tsan_link",
5654
feature_name = "tsan_link",
57-
args = [":tsan_link_args"],
55+
args = [":tsan_args"],
5856
visibility = ["//visibility:public"],
5957
)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ASAN_OPTIONS=exitcode=55 allow_addr2line=1 verbosity=1 check_initialization_order=1 detect_stack_use_after_return=1 print_stats=1 halt_on_error=1 allocator_may_return_null=1 detect_leaks=1 suppressions=%ROOT%sanitizers/suppressions/asan.supp
2-
UBSAN_OPTIONS=exitcode=55 allow_addr2line=1 verbosity=1 print_stacktrace=1 halt_on_error=1 suppressions=%ROOT%sanitizers/suppressions/ubsan.supp
1+
ASAN_OPTIONS=allocator_may_return_null=1 allow_addr2line=1 check_initialization_order=1 detect_leaks=1 detect_stack_use_after_return=1 exitcode=55 halt_on_error=1 print_stats=1 strict_string_checks=1 verbosity=1 suppressions=%ROOT%sanitizers/suppressions/asan.supp
2+
UBSAN_OPTIONS=allow_addr2line=1 exitcode=55 halt_on_error=1 print_stacktrace=1 verbosity=1 suppressions=%ROOT%sanitizers/suppressions/ubsan.supp
33
LSAN_OPTIONS=exitcode=55 suppressions=%ROOT%sanitizers/suppressions/lsan.supp
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
TSAN_OPTIONS=exitcode=55 allow_addr2line=1 verbosity=1 detect_deadlocks=1 second_deadlock_stack=1 halt_on_error=1 suppressions=%ROOT%sanitizers/suppressions/tsan.supp
1+
TSAN_OPTIONS=allow_addr2line=1 detect_deadlocks=1 exitcode=55 halt_on_error=1 second_deadlock_stack=1 verbosity=1 suppressions=%ROOT%sanitizers/suppressions/tsan.supp

0 commit comments

Comments
 (0)