Merge pull request #76687 from cachemeifyoucan/eng/PR-dead-code-removal

[NFC][ScanDependency] Remove some ununsed code

Author: cachemeifyoucan

include/swift/AST/ModuleDependencies.h

@@ -992,9 +992,6 @@ class SwiftDependencyScanningService {
   /// CAS ObjectStore Instance.
   std::shared_ptr<llvm::cas::ObjectStore> CAS;
 
-  /// The common dependencies that is needed for every swift compiler instance.
-  std::vector<std::string> CommonDependencyFiles;
-
   /// File prefix mapper.
   std::unique_ptr<llvm::TreePathPrefixMapper> Mapper;
 

include/swift/AST/ModuleLoader.h

@@ -373,7 +373,6 @@ class ModuleLoader {
   virtual llvm::SmallVector<std::pair<ModuleDependencyID, ModuleDependencyInfo>, 1>
   getModuleDependencies(Identifier moduleName,
                         StringRef moduleOutputPath,
-                        llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS,
                         const llvm::DenseSet<clang::tooling::dependencies::ModuleID> &alreadySeenClangModules,
                         clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,
                         InterfaceSubContextDelegate &delegate,

include/swift/ClangImporter/ClangImporter.h

@@ -481,7 +481,6 @@ class ClangImporter final : public ClangModuleLoader {
 
   llvm::SmallVector<std::pair<ModuleDependencyID, ModuleDependencyInfo>, 1>
   getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath,
-                        llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS,
                         const llvm::DenseSet<clang::tooling::dependencies::ModuleID> &alreadySeenClangModules,
                         clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,
                         InterfaceSubContextDelegate &delegate,

include/swift/Sema/SourceLoader.h

@@ -100,7 +100,6 @@ class SourceLoader : public ModuleLoader {
 
   llvm::SmallVector<std::pair<ModuleDependencyID, ModuleDependencyInfo>, 1>
   getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath,
-                        llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS,
                         const llvm::DenseSet<clang::tooling::dependencies::ModuleID> &alreadySeenClangModules,
                         clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,
                         InterfaceSubContextDelegate &delegate,

include/swift/Serialization/SerializedModuleLoader.h

@@ -258,7 +258,6 @@ class SerializedModuleLoaderBase : public ModuleLoader {
 
   virtual llvm::SmallVector<std::pair<ModuleDependencyID, ModuleDependencyInfo>, 1>
   getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath,
-                        llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS,
                         const llvm::DenseSet<clang::tooling::dependencies::ModuleID> &alreadySeenClangModules,
                         clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,
                         InterfaceSubContextDelegate &delegate,

lib/AST/ModuleDependencies.cpp

@@ -691,27 +691,6 @@ bool SwiftDependencyScanningService::setupCachingDependencyScanningService(
   CASOpts = Instance.getInvocation().getCASOptions().CASOpts;
   CAS = Instance.getSharedCASInstance();
 
-  // Add SDKSetting file.
-  SmallString<256> SDKSettingPath;
-  llvm::sys::path::append(
-      SDKSettingPath,
-      Instance.getInvocation().getSearchPathOptions().getSDKPath(),
-      "SDKSettings.json");
-  CommonDependencyFiles.emplace_back(SDKSettingPath.data(),
-                                     SDKSettingPath.size());
-
-  // Add Legacy layout file (maybe just hard code instead of searching).
-  for (auto RuntimeLibPath :
-       Instance.getInvocation().getSearchPathOptions().RuntimeLibraryPaths) {
-    auto &FS = Instance.getFileSystem();
-    std::error_code EC;
-    for (auto F = FS.dir_begin(RuntimeLibPath, EC);
-         !EC && F != llvm::vfs::directory_iterator(); F.increment(EC)) {
-      if (F->path().ends_with(".yaml"))
-        CommonDependencyFiles.emplace_back(F->path().str());
-    }
-  }
-
   auto CachingFS =
       llvm::cas::createCachingOnDiskFileSystem(Instance.getObjectStore());
   if (!CachingFS) {

lib/ClangImporter/ClangModuleDependencyScanner.cpp

@@ -421,7 +421,6 @@ computeClangWorkingDirectory(const std::vector<std::string> &commandLineArgs,
 ModuleDependencyVector
 ClangImporter::getModuleDependencies(Identifier moduleName,
                                      StringRef moduleOutputPath,
-                                     llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS,
                                      const llvm::DenseSet<clang::tooling::dependencies::ModuleID> &alreadySeenClangModules,
                                      clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,
                                      InterfaceSubContextDelegate &delegate,

lib/DependencyScan/ModuleDependencyScanner.cpp

@@ -218,15 +218,13 @@ ModuleDependencyScanningWorker::scanFilesystemForModuleDependency(
   ModuleDependencyVector moduleDependencies =
       swiftScannerModuleLoader->getModuleDependencies(
           moduleName, cache.getModuleOutputPath(),
-          cache.getScanService().getCachingFS(),
           cache.getAlreadySeenClangModules(), clangScanningTool,
           *scanningASTDelegate, cache.getScanService().getPrefixMapper(),
           isTestableImport);
 
   if (moduleDependencies.empty())
     moduleDependencies = clangScannerModuleLoader->getModuleDependencies(
         moduleName, cache.getModuleOutputPath(),
-        cache.getScanService().getCachingFS(),
         cache.getAlreadySeenClangModules(), clangScanningTool,
         *scanningASTDelegate, cache.getScanService().getPrefixMapper(),
         isTestableImport);
@@ -239,19 +237,17 @@ ModuleDependencyScanningWorker::scanFilesystemForSwiftModuleDependency(
     Identifier moduleName, const ModuleDependenciesCache &cache) {
   return swiftScannerModuleLoader->getModuleDependencies(
       moduleName, cache.getModuleOutputPath(),
-      cache.getScanService().getCachingFS(), cache.getAlreadySeenClangModules(),
-      clangScanningTool, *scanningASTDelegate,
-      cache.getScanService().getPrefixMapper(), false);
+      cache.getAlreadySeenClangModules(), clangScanningTool,
+      *scanningASTDelegate, cache.getScanService().getPrefixMapper(), false);
 }
 
 ModuleDependencyVector
 ModuleDependencyScanningWorker::scanFilesystemForClangModuleDependency(
     Identifier moduleName, const ModuleDependenciesCache &cache) {
   return clangScannerModuleLoader->getModuleDependencies(
       moduleName, cache.getModuleOutputPath(),
-      cache.getScanService().getCachingFS(), cache.getAlreadySeenClangModules(),
-      clangScanningTool, *scanningASTDelegate,
-      cache.getScanService().getPrefixMapper(), false);
+      cache.getAlreadySeenClangModules(), clangScanningTool,
+      *scanningASTDelegate, cache.getScanService().getPrefixMapper(), false);
 }
 
 template <typename Function, typename... Args>

lib/Sema/SourceLoader.cpp

@@ -157,7 +157,6 @@ void SourceLoader::loadExtensions(NominalTypeDecl *nominal,
 ModuleDependencyVector
 SourceLoader::getModuleDependencies(Identifier moduleName,
                                     StringRef moduleOutputPath,
-                                    llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS,
                                     const llvm::DenseSet<clang::tooling::dependencies::ModuleID> &alreadySeenClangModules,
                                     clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,
                                     InterfaceSubContextDelegate &delegate,

lib/Serialization/ScanningLoaders.cpp

@@ -311,7 +311,6 @@ SwiftModuleScanner::scanInterfaceFile(Twine moduleInterfacePath,
 
 ModuleDependencyVector SerializedModuleLoaderBase::getModuleDependencies(
     Identifier moduleName, StringRef moduleOutputPath,
-    llvm::IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> CacheFS,
     const llvm::DenseSet<clang::tooling::dependencies::ModuleID>
         &alreadySeenClangModules,
     clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,