aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Frontend/CompilerInvocation.cpp
diff options
context:
space:
mode:
authorJeremy Morse <jeremy.morse@sony.com>2019-11-08 11:33:40 +0000
committerJeremy Morse <jeremy.morse@sony.com>2019-11-08 12:07:42 +0000
commit6b45e1bc11e91ea7b57a6ab1c19461a86dba33f8 (patch)
treef40ae71d36c84637d11178302c6df17f6141223f /clang/lib/Frontend/CompilerInvocation.cpp
parentd6be9273c6035c07b25dd1494f76cd61d523b878 (diff)
downloadllvm-6b45e1bc11e91ea7b57a6ab1c19461a86dba33f8.zip
llvm-6b45e1bc11e91ea7b57a6ab1c19461a86dba33f8.tar.gz
llvm-6b45e1bc11e91ea7b57a6ab1c19461a86dba33f8.tar.bz2
Revert "[clang] Report sanitizer blacklist as a dependency in cc1"
This reverts commit 03b84e4f6d0e1c04f22d69cc445f36e1f713beb4. This breaks dfsan tests with a linking failure, in for example this build: http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/24312 Reverting this patch locally makes those tests succeed.
Diffstat (limited to 'clang/lib/Frontend/CompilerInvocation.cpp')
-rw-r--r--clang/lib/Frontend/CompilerInvocation.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 17fd4ce..195a29d 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1447,26 +1447,7 @@ static void ParseDependencyOutputArgs(DependencyOutputOptions &Opts,
// Add sanitizer blacklists as extra dependencies.
// They won't be discovered by the regular preprocessor, so
// we let make / ninja to know about this implicit dependency.
- if (!Args.hasArg(OPT_fno_sanitize_blacklist)) {
- for (const auto *A : Args.filtered(OPT_fsanitize_blacklist)) {
- StringRef Val = A->getValue();
- if (Val.find('=') == StringRef::npos)
- Opts.ExtraDeps.push_back(Val);
- }
- if (Opts.IncludeSystemHeaders) {
- for (const auto *A : Args.filtered(OPT_fsanitize_system_blacklist)) {
- StringRef Val = A->getValue();
- if (Val.find('=') == StringRef::npos)
- Opts.ExtraDeps.push_back(Val);
- }
- }
- }
-
- // Propagate the extra dependencies.
- for (const auto *A : Args.filtered(OPT_fdepfile_entry)) {
- Opts.ExtraDeps.push_back(A->getValue());
- }
-
+ Opts.ExtraDeps = Args.getAllArgValues(OPT_fdepfile_entry);
// Only the -fmodule-file=<file> form.
for (const auto *A : Args.filtered(OPT_fmodule_file)) {
StringRef Val = A->getValue();