Skip to content

Commit

Permalink
Revert "Replace 'blacklist' with 'ignorelist' in ./tools/msan/."
Browse files Browse the repository at this point in the history
This reverts commit 3b6263f.

Reason for revert: Broke the build
https://ci.chromium.org/ui/p/chromium/builders/ci/chromeos-amd64-generic-cfi-thin-lto-rel/30980

"clang++: error: unknown argument: '-fsanitize-ignorelist="

Original change's description:
> Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
>
> Bug: 1097272, 1097268
> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
> Commit-Queue: Dylan Cutler <dylancutler@google.com>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Jonathan Metzman <metzman@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#883035}

Bug: 1097272
Bug: 1097268
Change-Id: I41914653053aa5f44d292295aa8822728bf9da6c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2897541
Auto-Submit: Ian Clelland <iclelland@chromium.org>
Owners-Override: Ian Clelland <iclelland@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#883042}
  • Loading branch information
clelland authored and Chromium LUCI CQ committed May 14, 2021
1 parent e023a6f commit c8e531a
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
44 changes: 22 additions & 22 deletions build/config/sanitizers/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,11 @@ config("asan_flags") {
if (is_asan) {
cflags += [ "-fsanitize=address" ]
if (is_win) {
if (!defined(asan_win_blocklist_path)) {
asan_win_blocklist_path =
if (!defined(asan_win_blacklist_path)) {
asan_win_blacklist_path =
rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
}
cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
}
}
}
Expand Down Expand Up @@ -306,13 +306,13 @@ config("link_shared_library") {
config("cfi_flags") {
cflags = []
if (is_cfi && current_toolchain == default_toolchain) {
if (!defined(cfi_ignorelist_path)) {
cfi_ignorelist_path =
if (!defined(cfi_blacklist_path)) {
cfi_blacklist_path =
rebase_path("//tools/cfi/ignores.txt", root_build_dir)
}
cflags += [
"-fsanitize=cfi-vcall",
"-fsanitize-ignorelist=$cfi_ignorelist_path",
"-fsanitize-blacklist=$cfi_blacklist_path",
]

if (use_cfi_cast) {
Expand Down Expand Up @@ -409,37 +409,37 @@ config("msan_flags") {
if (is_msan) {
assert(is_linux || is_chromeos,
"msan only supported on linux x86_64/ChromeOS")
if (!defined(msan_ignorelist_path)) {
msan_ignorelist_path =
rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
if (!defined(msan_blacklist_path)) {
msan_blacklist_path =
rebase_path("//tools/msan/blacklist.txt", root_build_dir)
}
cflags = [
"-fsanitize=memory",
"-fsanitize-memory-track-origins=$msan_track_origins",
"-fsanitize-ignorelist=$msan_ignorelist_path",
"-fsanitize-blacklist=$msan_blacklist_path",
]
}
}

config("tsan_flags") {
if (is_tsan) {
assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
if (!defined(tsan_ignorelist_path)) {
tsan_ignorelist_path =
if (!defined(tsan_blacklist_path)) {
tsan_blacklist_path =
rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
}
cflags = [
"-fsanitize=thread",
"-fsanitize-ignorelist=$tsan_ignorelist_path",
"-fsanitize-blacklist=$tsan_blacklist_path",
]
}
}

config("ubsan_flags") {
cflags = []
if (is_ubsan) {
if (!defined(ubsan_ignorelist_path)) {
ubsan_ignorelist_path =
if (!defined(ubsan_blacklist_path)) {
ubsan_blacklist_path =
rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
}
cflags += [
Expand All @@ -456,7 +456,7 @@ config("ubsan_flags") {
"-fsanitize=signed-integer-overflow",
"-fsanitize=unreachable",
"-fsanitize=vla-bound",
"-fsanitize-ignorelist=$ubsan_ignorelist_path",
"-fsanitize-blacklist=$ubsan_blacklist_path",
]

# Chromecast ubsan builds fail to compile with these
Expand Down Expand Up @@ -486,16 +486,16 @@ config("ubsan_no_recover") {

config("ubsan_security_flags") {
if (is_ubsan_security) {
if (!defined(ubsan_security_ignorelist_path)) {
ubsan_security_ignorelist_path =
if (!defined(ubsan_security_blacklist_path)) {
ubsan_security_blacklist_path =
rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
}
cflags = [
"-fsanitize=function",
"-fsanitize=shift",
"-fsanitize=signed-integer-overflow",
"-fsanitize=vla-bound",
"-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
"-fsanitize-blacklist=$ubsan_security_blacklist_path",
]
}
}
Expand All @@ -508,13 +508,13 @@ config("ubsan_null_flags") {

config("ubsan_vptr_flags") {
if (is_ubsan_vptr) {
if (!defined(ubsan_vptr_ignorelist_path)) {
ubsan_vptr_ignorelist_path =
if (!defined(ubsan_vptr_blacklist_path)) {
ubsan_vptr_blacklist_path =
rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
}
cflags = [
"-fsanitize=vptr",
"-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
"-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
]
}
}
Expand Down
14 changes: 7 additions & 7 deletions build_overrides/build.gni
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ declare_args() {
# Allows different projects to specify their own suppression/ignore lists for
# sanitizer tools.
# asan_suppressions_file = "path/to/asan_suppressions.cc"
# asan_win_ignorelist_path = "path/to/asan/blocklist_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_ignorelist_path = "path/to/tsan/ignores.txt"
# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
# tsan_blacklist_path = "path/to/tsan/ignores.txt"
# msan_blacklist_path = "path/to/msan/blacklist.txt"
# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
# cfi_blacklist_path = "path/to/cfi/ignores.txt"

declare_args() {
# Android 32-bit non-component, non-clang builds cannot have symbol_level=2
Expand Down
File renamed without changes.

0 comments on commit c8e531a

Please sign in to comment.