Merge pull request #69749 from benlangmuir/update

Update for clang maybeAddDependency API change

Author: benlangmuir

lib/AST/ModuleLoader.cpp

@@ -49,7 +49,6 @@ DependencyTracker::addDependency(StringRef File, bool IsSystem) {
   // dimension, which we accept and pass along to the clang DependencyCollector.
   clangCollector->maybeAddDependency(File, /*FromModule=*/false,
                                      IsSystem, /*IsModuleFile=*/false,
-                                     /* FileManager=*/ nullptr,
                                      /*IsMissing=*/false);
 }
 

lib/ClangImporter/ClangImporter.cpp

@@ -377,12 +377,11 @@ class ClangImporterDependencyCollector : public clang::DependencyCollector
   }
 
   void maybeAddDependency(StringRef Filename, bool FromModule, bool IsSystem,
-                          bool IsModuleFile, clang::FileManager *fileManager,
-                          bool IsMissing) override {
+                          bool IsModuleFile, bool IsMissing) override {
     if (FileCollector)
       FileCollector->addFile(Filename);
     clang::DependencyCollector::maybeAddDependency(
-        Filename, FromModule, IsSystem, IsModuleFile, fileManager, IsMissing);
+        Filename, FromModule, IsSystem, IsModuleFile, IsMissing);
   }
 };
 } // end anonymous namespace