Use default CacheNegativeStats setting except where required.

Author: Bigcheese

clang/unittests/Tooling/DependencyScanning/DependencyScannerTest.cpp

@@ -239,8 +239,7 @@ TEST(DependencyScanner, ScanDepsWithFS) {
       ScanningMode::DependencyDirectivesScan, ScanningOutputFormat::Make,
       CASOptions(), nullptr, nullptr, nullptr, ScanningOptimizations::Default,
       /*EagerLoadModules=*/false,
-      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()));
   DependencyScanningTool ScanTool(Service, VFS);
 
   std::string DepFile;
@@ -266,8 +265,7 @@ TEST(DependencyScanner, DepScanFSWithCASProvider) {
       ScanningMode::DependencyDirectivesScan, ScanningOutputFormat::Make,
       CASOptions(), nullptr, nullptr, nullptr, ScanningOptimizations::Default,
       /*EagerLoadModules=*/false,
-      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()));
   {
     DependencyScanningWorkerFilesystem DepFS(Service, std::move(CASFS));
     llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>> File =
@@ -357,8 +355,7 @@ TEST(DependencyScanner, ScanDepsWithModuleLookup) {
       ScanningMode::DependencyDirectivesScan, ScanningOutputFormat::Make,
       CASOptions(), nullptr, nullptr, nullptr, ScanningOptimizations::Default,
       /*EagerLoadModules=*/false,
-      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()));
   DependencyScanningTool ScanTool(Service, InterceptFS);
 
   // This will fail with "fatal error: module 'Foo' not found" but it doesn't
@@ -393,8 +390,7 @@ TEST(DependencyScanner, ScanDepsWithDiagConsumer) {
       ScanningMode::DependencyDirectivesScan, ScanningOutputFormat::Make,
       CASOptions(), nullptr, nullptr, nullptr, ScanningOptimizations::Default,
       /*EagerLoadModules=*/false,
-      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()));
   DependencyScanningWorker Worker(Service, VFS);
 
   llvm::DenseSet<ModuleID> AlreadySeen;
@@ -480,8 +476,9 @@ TEST(DependencyScanner, NoNegativeCache) {
   DependencyScanningService Service(
       ScanningMode::DependencyDirectivesScan, ScanningOutputFormat::Make,
       CASOptions(), nullptr, nullptr, nullptr, ScanningOptimizations::All,
-      false, false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      false);
+      /*EagerLoadModules=*/false,
+      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
+      /*CacheNegativeStats=*/false);
   DependencyScanningTool ScanTool(Service, VFS);
 
   std::vector<std::string> CommandLine0 = {"clang",

clang/unittests/Tooling/DependencyScanning/DependencyScanningFilesystemTest.cpp

@@ -28,7 +28,7 @@ TEST(DependencyScanningWorkerFilesystem, CacheStatusFailures) {
       clang::CASOptions(), nullptr, nullptr, nullptr,
       ScanningOptimizations::Default, /*EagerLoadModules=*/false,
       /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*CacheNegativeStats=*/true);
   DependencyScanningWorkerFilesystem DepFS(Service, InstrumentingFS);
   DependencyScanningWorkerFilesystem DepFS2(Service, InstrumentingFS);
 
@@ -59,7 +59,7 @@ TEST(DependencyScanningFilesystem, CacheGetRealPath) {
       clang::CASOptions(), nullptr, nullptr, nullptr,
       ScanningOptimizations::Default, /*EagerLoadModules=*/false,
       /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*CacheNegativeStats=*/true);
   DependencyScanningWorkerFilesystem DepFS(Service, InstrumentingFS);
   DependencyScanningWorkerFilesystem DepFS2(Service, InstrumentingFS);
 
@@ -98,8 +98,7 @@ TEST(DependencyScanningFilesystem, RealPathAndStatusInvariants) {
       ScanningMode::DependencyDirectivesScan, ScanningOutputFormat::Make,
       clang::CASOptions(), nullptr, nullptr, nullptr,
       ScanningOptimizations::Default, /*EagerLoadModules=*/false,
-      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()));
   DependencyScanningWorkerFilesystem DepFS(Service, InMemoryFS);
 
   // Success.
@@ -157,7 +156,7 @@ TEST(DependencyScanningFilesystem, CacheStatOnExists) {
       clang::CASOptions(), nullptr, nullptr, nullptr,
       ScanningOptimizations::Default, /*EagerLoadModules=*/false,
       /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*CacheNegativeStats=*/true);
   DependencyScanningWorkerFilesystem DepFS(Service, InstrumentingFS);
 
   DepFS.status("/foo");
@@ -185,7 +184,7 @@ TEST(DependencyScanningFilesystem, CacheStatFailures) {
       clang::CASOptions(), nullptr, nullptr, nullptr,
       ScanningOptimizations::Default, /*EagerLoadModules=*/false,
       /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*CacheNegativeStats=*/true);
   DependencyScanningWorkerFilesystem DepFS(Service, InstrumentingFS);
 
   DepFS.status("/dir");
@@ -217,7 +216,7 @@ TEST(DependencyScanningFilesystem, DiagnoseStaleStatFailures) {
       clang::CASOptions(), nullptr, nullptr, nullptr,
       ScanningOptimizations::Default, /*EagerLoadModules=*/false,
       /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*CacheNegativeStats=*/true);
   DependencyScanningWorkerFilesystem DepFS(Service, InMemoryFS);
 
   bool Path1Exists = DepFS.exists("/path1.suffix");
@@ -248,7 +247,7 @@ TEST(DependencyScanningFilesystem, DiagnoseCachedFileSizeChange) {
       clang::CASOptions(), nullptr, nullptr, nullptr,
       ScanningOptimizations::Default, /*EagerLoadModules=*/false,
       /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()),
-      true);
+      /*CacheNegativeStats=*/true);
   DependencyScanningWorkerFilesystem DepFS(Service, InMemoryFS1);
 
   InMemoryFS1->addFile("/path1.suffix", 0,
@@ -282,8 +281,12 @@ TEST(DependencyScanningFilesystem, DoNotDiagnoseDirSizeChange) {
   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS =
       llvm::vfs::createPhysicalFileSystem();
 
-  DependencyScanningFilesystemSharedCache SharedCache;
-  DependencyScanningWorkerFilesystem DepFS(SharedCache, FS);
+  DependencyScanningService Service(
+      ScanningMode::DependencyDirectivesScan, ScanningOutputFormat::Make,
+      clang::CASOptions(), nullptr, nullptr, nullptr,
+      ScanningOptimizations::Default, /*EagerLoadModules=*/false,
+      /*TraceVFS=*/false, llvm::sys::toTimeT(std::chrono::system_clock::now()));
+  DependencyScanningWorkerFilesystem DepFS(Service, FS);
 
   // Trigger the file system cache.
   ASSERT_EQ(DepFS.exists(Dir), true);
@@ -302,6 +305,6 @@ TEST(DependencyScanningFilesystem, DoNotDiagnoseDirSizeChange) {
   }
 
   // We do not report directory size changes.
-  auto InvalidEntries = SharedCache.getOutOfDateEntries(*FS);
+  auto InvalidEntries = Service.getSharedCache().getOutOfDateEntries(*FS);
   EXPECT_EQ(InvalidEntries.size(), 0u);
 }