From 285dd08b56215840d721961add4a355b60d673a7 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Tue, 15 Jun 2021 20:32:24 -0700 Subject: [PATCH] [Driver] Delete -fsanitize-coverage-blocklist= in favor of -fsanitize-coverage-ignorelist= We are settled with -fsanitize-coverage-ignorelist (D101832). Just delete -fsanitize-coverage-blocklist which is also new. --- clang/docs/ClangCommandLineReference.rst | 2 +- clang/docs/SanitizerCoverage.rst | 2 +- clang/include/clang/Driver/Options.td | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/clang/docs/ClangCommandLineReference.rst b/clang/docs/ClangCommandLineReference.rst index 54b417d..74557c5 100644 --- a/clang/docs/ClangCommandLineReference.rst +++ b/clang/docs/ClangCommandLineReference.rst @@ -933,7 +933,7 @@ Generalize pointers in CFI indirect call type signature checks Restrict sanitizer coverage instrumentation exclusively to modules and functions that match the provided special case list, except the blocked ones -.. option:: -fsanitize-coverage-ignorelist=, -fsanitize-coverage-blacklist=, -fsanitize-coverage-blocklist= +.. option:: -fsanitize-coverage-ignorelist=, -fsanitize-coverage-blacklist= Disable sanitizer coverage instrumentation for modules and functions that match the provided special case list, even the allowed ones diff --git a/clang/docs/SanitizerCoverage.rst b/clang/docs/SanitizerCoverage.rst index ebd5d72..81b3cfe 100644 --- a/clang/docs/SanitizerCoverage.rst +++ b/clang/docs/SanitizerCoverage.rst @@ -326,7 +326,7 @@ Disabling instrumentation without source modification It is sometimes useful to tell SanitizerCoverage to instrument only a subset of the functions in your target without modifying source files. With ``-fsanitize-coverage-allowlist=allowlist.txt`` -and ``-fsanitize-coverage-blocklist=blocklist.txt``, +and ``-fsanitize-coverage-ignorelist=blocklist.txt``, you can specify such a subset through the combination of an allowlist and a blocklist. SanitizerCoverage will only instrument functions that satisfy two conditions. diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 329caae..7c6b22c 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -1546,10 +1546,6 @@ def fsanitize_coverage_ignorelist : Joined<["-"], "fsanitize-coverage-ignorelist HelpText<"Disable sanitizer coverage instrumentation for modules and functions " "that match the provided special case list, even the allowed ones">, MarshallingInfoStringVector>; -def : Joined<["-"], "fsanitize-coverage-blocklist=">, - Group, Flags<[CoreOption, HelpHidden]>, - Alias, - HelpText<"Deprecated, use -fsanitize-coverage-ignorelist= instead">; def : Joined<["-"], "fsanitize-coverage-blacklist=">, Group, Flags<[CoreOption, HelpHidden]>, Alias, -- 2.7.4