[PATCH] D69079: 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).

[Kousik Kumar via Phabricator via cfe-commits]

kousikk created this revision.
kousikk added reviewers: Bigcheese, jkorous, arphaman.
Herald added subscribers: cfe-commits, dexonsmith.
Herald added a project: clang.
kousikk added a comment.

Failure - http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/11583


This reverts commit 962ca076e51c25a7a08f4e0d329c65328a635bdb <https://reviews.llvm.org/rG962ca076e51c25a7a08f4e0d329c65328a635bdb>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D69079

Files:
  clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
  clang/test/ClangScanDeps/Inputs/non-header-dependency.json
  clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
  clang/test/ClangScanDeps/non-header-dependency.cpp


Index: clang/test/ClangScanDeps/non-header-dependency.cpp
===================================================================
--- 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
Index: clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
===================================================================
--- clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt
+++ /dev/null
@@ -1 +0,0 @@
-fun:*
Index: clang/test/ClangScanDeps/Inputs/non-header-dependency.json
===================================================================
--- 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"
-    }
-]
Index: clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
===================================================================
--- clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
+++ clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
@@ -36,8 +36,6 @@
       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:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69079.225347.patch
Type: text/x-patch
Size: 1958 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191017/a97ef11c/attachment-0001.bin>