Change asan to use blocklist.
Changing the names of files here and where they're referenced. There's also other locations in v8/tools/memory/asan and third_party/dawn/tools/memory/asan that will need to be changed, but scoping this to the changes referenced in the bug. Bug: 1097270 Change-Id: I008e8f5eae60ec4cadb224a4b652f183951c7cb1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2565170 Reviewed-by: Mirko Bonadei <mbonadei@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Reid Kleckner <rnk@chromium.org> Reviewed-by: Jonathan Metzman <metzman@chromium.org> Commit-Queue: Eric Robinson <ericrobinson@chromium.org> Cr-Commit-Position: refs/heads/master@{#832390}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
5c7d727941
commit
1d88beef04
build/config/sanitizers
build_overrides
tools/memory/asan
@ -271,22 +271,12 @@ config("asan_flags") {
|
||||
cflags = []
|
||||
if (is_asan) {
|
||||
cflags += [ "-fsanitize=address" ]
|
||||
if (asan_use_blacklist) {
|
||||
if (is_win) {
|
||||
if (!defined(asan_win_blacklist_path)) {
|
||||
asan_win_blacklist_path =
|
||||
rebase_path("//tools/memory/asan/blacklist_win.txt",
|
||||
root_build_dir)
|
||||
}
|
||||
cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
|
||||
} else {
|
||||
# TODO(rnk): Remove this as discussed in http://crbug.com/427202.
|
||||
if (!defined(asan_blacklist_path)) {
|
||||
asan_blacklist_path =
|
||||
rebase_path("//tools/memory/asan/blacklist.txt", root_build_dir)
|
||||
}
|
||||
cflags += [ "-fsanitize-blacklist=$asan_blacklist_path" ]
|
||||
if (is_win) {
|
||||
if (!defined(asan_win_blacklist_path)) {
|
||||
asan_win_blacklist_path =
|
||||
rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
|
||||
}
|
||||
cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -104,9 +104,6 @@ declare_args() {
|
||||
# trace-pc-guard,indirect-calls
|
||||
sanitizer_coverage_flags = ""
|
||||
|
||||
# Use blacklists from tools/memory/asan when compiling with asan.
|
||||
asan_use_blacklist = true
|
||||
|
||||
# When enabled, only relevant sanitizer defines are set, but compilation
|
||||
# happens with no extra flags. This is useful when in component build
|
||||
# enabling sanitizers only in some of the components.
|
||||
|
@ -35,8 +35,7 @@ declare_args() {
|
||||
# Allows different projects to specify their own suppression/ignore lists for
|
||||
# sanitizer tools.
|
||||
# asan_suppressions_file = "path/to/asan_suppressions.cc"
|
||||
# asan_blacklist_path = "path/to/asan/blacklist.txt"
|
||||
# asan_win_blacklist_path = "path/to/asan/blacklist_win.txt"
|
||||
# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
|
||||
# lsan_suppressions_file = "path/to/lsan_suppressions.cc"
|
||||
# tsan_suppressions_file = "path/to/tsan_suppressions.cc"
|
||||
# tsan_blacklist_path = "path/to/tsan/ignores.txt"
|
||||
|
@ -1,4 +0,0 @@
|
||||
# The rules in this file are only applied at compile time. If you can modify the
|
||||
# source in question, consider function attributes to disable instrumentation.
|
||||
#
|
||||
# Please think twice before you add or remove these rules.
|
Reference in New Issue
Block a user