================
@@ -86,114 +55,76 @@ static bool createAndRunToolInvocation(
}
bool DependencyScanningWorker::scanDependencies(
- StringRef WorkingDirectory, const std::vector<std::string> &CommandLine,
+ StringRef WorkingDirectory, ArrayRef<std::vector<std::string>>
CommandLines,
DependencyConsumer &Consumer, DependencyActionController &Controller,
- DiagnosticConsumer &DC,
- IntrusiveRefCntPtr<llvm::vfs::FileSystem> OverlayFS) {
- IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS = DepFS;
- if (OverlayFS) {
+ DiagnosticsEngine &Diags,
+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS) {
#ifndef NDEBUG
- bool SawDepFS = false;
- OverlayFS->visit(
- [&](llvm::vfs::FileSystem &VFS) { SawDepFS |= &VFS == DepFS.get(); });
- assert(SawDepFS && "OverlayFS not based on DepFS");
+ bool SawDepFS = false;
+ FS->visit(
+ [&](llvm::vfs::FileSystem &VFS) { SawDepFS |= &VFS == DepFS.get(); });
+ assert(SawDepFS && "FS not based on DepFS");
----------------
jansvoboda11 wrote:
The rename and non-null `FS` might be better to do in a separate commit.
https://github.com/llvm/llvm-project/pull/169964
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
