diff options
| author | Kousik Kumar <kousikk@google.com> | 2019-10-17 04:50:12 +0000 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2019-10-17 04:50:12 +0000 |
| commit | 9e7e36d4c2602ed10fc1ac037c7ebed50b7df859 (patch) | |
| tree | 83e97a4ab6d52d69a3ca6e73fe6b0baf710d14ca | |
| parent | 6c393e9d74d27a9e9d0d9c60537d7b2d4203ae13 (diff) | |
| download | bcm5719-llvm-9e7e36d4c2602ed10fc1ac037c7ebed50b7df859.tar.gz bcm5719-llvm-9e7e36d4c2602ed10fc1ac037c7ebed50b7df859.zip | |
Revert "Include sanitize blacklist and other extra deps as part of scan-deps output"
This test is failing on Windows bots, revert for now (will check the right fix and retry the patch).
Summary: This reverts commit 962ca076e51c25a7a08f4e0d329c65328a635bdb.
Reviewers: Bigcheese, jkorous, arphaman
Subscribers: dexonsmith, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D69079
llvm-svn: 375079
4 files changed, 0 insertions, 24 deletions
diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp index 70c8b5a082c..f382c202f8c 100644 --- a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp +++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp @@ -36,8 +36,6 @@ public: llvm::sys::path::remove_dots(CanonPath, /*remove_dot_dot=*/true); C.handleFileDependency(*Opts, CanonPath); } - for (const auto& ExtraDep : Opts->ExtraDeps) - C.handleFileDependency(*Opts, ExtraDep); } private: diff --git a/clang/test/ClangScanDeps/Inputs/non-header-dependency.json b/clang/test/ClangScanDeps/Inputs/non-header-dependency.json deleted file mode 100644 index 65ffa2c5ee6..00000000000 --- a/clang/test/ClangScanDeps/Inputs/non-header-dependency.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "directory": "DIR", - "command": "clang -E DIR/non-header-dependency_input.cpp -fsanitize=bounds -fsanitize-blacklist=DIR/Inputs/sanitize-blacklist.txt", - "file": "DIR/non-header-dependency_input.cpp" - } -] diff --git a/clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt b/clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt deleted file mode 100644 index 67375d823d5..00000000000 --- a/clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt +++ /dev/null @@ -1 +0,0 @@ -fun:* diff --git a/clang/test/ClangScanDeps/non-header-dependency.cpp b/clang/test/ClangScanDeps/non-header-dependency.cpp deleted file mode 100644 index a43826375d3..00000000000 --- a/clang/test/ClangScanDeps/non-header-dependency.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// RUN: rm -rf %t.dir -// RUN: rm -rf %t.cdb -// RUN: mkdir -p %t.dir -// RUN: cp %s %t.dir/non-header-dependency_input.cpp -// RUN: mkdir %t.dir/Inputs -// RUN: cp %S/Inputs/sanitize-blacklist.txt %t.dir/Inputs/sanitize-blacklist.txt -// RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/non-header-dependency.json > %t.cdb -// -// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s - -#define FOO "foo" - -// CHECK: Inputs{{/|\\}}sanitize-blacklist.txt -// CHECK-NEXT: non-header-dependency_input.cpp |
