This is an archive of the discontinued LLVM Phabricator instance.

Differential 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).
ClosedPublic

Authored by kousikk on Oct 16 2019, 8:33 PM.

Details

Reviewers
Bigcheese
jkorous
arphaman
Commits
rG9e7e36d4c260: Revert "Include sanitize blacklist and other extra deps as part of scan-deps…
rL375079: Revert "Include sanitize blacklist and other extra deps as part of scan-deps…
rC375079: Revert "Include sanitize blacklist and other extra deps as part of scan-deps…
Summary

This reverts commit 962ca076e51c25a7a08f4e0d329c65328a635bdb.

Diff Detail

Event Timeline

kousikk created this revision.Oct 16 2019, 8:33 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 16 2019, 8:33 PM
Herald added subscribers: cfe-commits, dexonsmith. · View Herald Transcript
kousikk added a comment.Oct 16 2019, 8:33 PM

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

Harbormaster completed remote builds in B39692: Diff 225347.Oct 16 2019, 8:37 PM
arphaman accepted this revision.Oct 16 2019, 9:42 PM
This revision is now accepted and ready to land.Oct 16 2019, 9:42 PM
Closed by commit rG9e7e36d4c260: Revert "Include sanitize blacklist and other extra deps as part of scan-deps… (authored by kousikk). · Explain WhyOct 16 2019, 9:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Tooling/
DependencyScanning/
2 lines
test/
ClangScanDeps/
Inputs/

Diff 225349

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

Show All 30 Linespublic:
void finishedMainFile(DiagnosticsEngine &Diags) override { void finishedMainFile(DiagnosticsEngine &Diags) override {
llvm::SmallString<256> CanonPath; llvm::SmallString<256> CanonPath;
for (const auto &File : getDependencies()) { for (const auto &File : getDependencies()) {
CanonPath = File; CanonPath = File;
llvm::sys::path::remove_dots(CanonPath, /*remove_dot_dot=*/true); llvm::sys::path::remove_dots(CanonPath, /*remove_dot_dot=*/true);
C.handleFileDependency(*Opts, CanonPath); C.handleFileDependency(*Opts, CanonPath);
} }
for (const auto& ExtraDep : Opts->ExtraDeps)
C.handleFileDependency(*Opts, ExtraDep);
} }
private: private:
std::unique_ptr<DependencyOutputOptions> Opts; std::unique_ptr<DependencyOutputOptions> Opts;
DependencyConsumer &C; DependencyConsumer &C;
}; };
/// A proxy file system that doesn't call `chdir` when changing the working /// A proxy file system that doesn't call `chdir` when changing the working
▲ Show 20 Lines • Show All 155 Lines • Show Last 20 Lines

clang/test/ClangScanDeps/Inputs/non-header-dependency.json

  • This file was deleted.
[
{
"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"
}
]

clang/test/ClangScanDeps/Inputs/sanitize-blacklist.txt

  • This file was deleted.
fun:*

clang/test/ClangScanDeps/non-header-dependency.cpp

  • This file was deleted.
// 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
clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp