r375079 - Revert "Include sanitize blacklist and other extra deps as part of scan-deps output"

[Kousik Kumar via cfe-commits]

Author: kousikk
Date: Wed Oct 16 21:50:12 2019
New Revision: 375079

URL: http://llvm.org/viewvc/llvm-project?rev=375079&view=rev
Log:
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

Removed:
    cfe/trunk/test/ClangScanDeps/Inputs/non-header-dependency.json
    cfe/trunk/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
    cfe/trunk/test/ClangScanDeps/non-header-dependency.cpp
Modified:
    cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

Modified: cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp?rev=375079&r1=375078&r2=375079&view=diff
==============================================================================
--- cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp (original)
+++ cfe/trunk/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp Wed Oct 16 21:50:12 2019
@@ -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:

Removed: cfe/trunk/test/ClangScanDeps/Inputs/non-header-dependency.json
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ClangScanDeps/Inputs/non-header-dependency.json?rev=375078&view=auto
==============================================================================
--- cfe/trunk/test/ClangScanDeps/Inputs/non-header-dependency.json (original)
+++ cfe/trunk/test/ClangScanDeps/Inputs/non-header-dependency.json (removed)
@@ -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"
-    }
-]

Removed: cfe/trunk/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ClangScanDeps/Inputs/sanitize-blacklist.txt?rev=375078&view=auto
==============================================================================
--- cfe/trunk/test/ClangScanDeps/Inputs/sanitize-blacklist.txt (original)
+++ cfe/trunk/test/ClangScanDeps/Inputs/sanitize-blacklist.txt (removed)
@@ -1 +0,0 @@
-fun:*

Removed: cfe/trunk/test/ClangScanDeps/non-header-dependency.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ClangScanDeps/non-header-dependency.cpp?rev=375078&view=auto
==============================================================================
--- cfe/trunk/test/ClangScanDeps/non-header-dependency.cpp (original)
+++ cfe/trunk/test/ClangScanDeps/non-header-dependency.cpp (removed)
@@ -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