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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@375079 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp b/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
index 70c8b5a082c061cffd25ac14c2b2c9ac405407b8..f382c202f8c2a6e46265a64e9364681e70b22af9 100644 (file)
--- a/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
+++ b/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/test/ClangScanDeps/Inputs/non-header-dependency.json b/test/ClangScanDeps/Inputs/non-header-dependency.json
deleted file mode 100644 (file)
index 65ffa2c..0000000
--- a/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/test/ClangScanDeps/Inputs/sanitize-blacklist.txt b/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
deleted file mode 100644 (file)
index 67375d8..0000000
--- a/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
+++ /dev/null
@@ -1 +0,0 @@
-fun:*

diff --git a/test/ClangScanDeps/non-header-dependency.cpp b/test/ClangScanDeps/non-header-dependency.cpp
deleted file mode 100644 (file)
index a438263..0000000
--- a/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