[clang] c94a345 - [clang][deps] Fix test by checking ignored files correctly

Jan Svoboda via cfe-commits cfe-commits at lists.llvm.org
Tue Jul 20 04:21:04 PDT 2021


Author: Jan Svoboda
Date: 2021-07-20T13:20:56+02:00
New Revision: c94a345a5c693b6c12a41e8f50e3fe96d1311991

URL: https://github.com/llvm/llvm-project/commit/c94a345a5c693b6c12a41e8f50e3fe96d1311991
DIFF: https://github.com/llvm/llvm-project/commit/c94a345a5c693b6c12a41e8f50e3fe96d1311991.diff

LOG: [clang][deps] Fix test by checking ignored files correctly

After a rebase, bc1a2979fc70d954ae97122205c71c8404a1b17e accidentally changed `shouldIgnoreFile(Filename)` to incorrect `IgnoredFiles.count(Filename)`. This avoided using native filenames, which the patch intended to solve in the first place.

Failing Windows builds:
* https://lab.llvm.org/buildbot#builders/123/builds/5147
* https://lab.llvm.org/buildbot#builders/86/builds/17177

Added: 
    

Modified: 
    clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
index 166d4a25363c..40e8bd2b8776 100644
--- a/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
+++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
@@ -166,8 +166,7 @@ bool DependencyScanningWorkerFilesystem::shouldIgnoreFile(
 llvm::ErrorOr<const CachedFileSystemEntry *>
 DependencyScanningWorkerFilesystem::getOrCreateFileSystemEntry(
     const StringRef Filename) {
-  bool ShouldMinimize =
-      !IgnoredFiles.count(Filename) && shouldMinimize(Filename);
+  bool ShouldMinimize = !shouldIgnoreFile(Filename) && shouldMinimize(Filename);
 
   if (const auto *Entry = Cache.getCachedEntry(Filename, ShouldMinimize))
     return Entry;


        


More information about the cfe-commits mailing list