This revision was automatically updated to reflect the committed changes. Closed by commit rG9e7e36d4c260: Revert "Include sanitize blacklist and other extra deps as part of scan-deps… (authored by kousikk).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D69079/new/ 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:
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:
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits