diff --git a/include/swift/AST/ModuleDependencies.h b/include/swift/AST/ModuleDependencies.h index a7b9fad377a82..87a4670e2c3d4 100644 --- a/include/swift/AST/ModuleDependencies.h +++ b/include/swift/AST/ModuleDependencies.h @@ -992,9 +992,6 @@ class SwiftDependencyScanningService { /// CAS ObjectStore Instance. std::shared_ptr CAS; - /// The common dependencies that is needed for every swift compiler instance. - std::vector CommonDependencyFiles; - /// File prefix mapper. std::unique_ptr Mapper; diff --git a/include/swift/AST/ModuleLoader.h b/include/swift/AST/ModuleLoader.h index 10e12c812571b..cc1dc0f5ad253 100644 --- a/include/swift/AST/ModuleLoader.h +++ b/include/swift/AST/ModuleLoader.h @@ -373,7 +373,6 @@ class ModuleLoader { virtual llvm::SmallVector, 1> getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath, - llvm::IntrusiveRefCntPtr CacheFS, const llvm::DenseSet &alreadySeenClangModules, clang::tooling::dependencies::DependencyScanningTool &clangScanningTool, InterfaceSubContextDelegate &delegate, diff --git a/include/swift/ClangImporter/ClangImporter.h b/include/swift/ClangImporter/ClangImporter.h index ebc58baa7a9d4..9745fd4062682 100644 --- a/include/swift/ClangImporter/ClangImporter.h +++ b/include/swift/ClangImporter/ClangImporter.h @@ -481,7 +481,6 @@ class ClangImporter final : public ClangModuleLoader { llvm::SmallVector, 1> getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath, - llvm::IntrusiveRefCntPtr CacheFS, const llvm::DenseSet &alreadySeenClangModules, clang::tooling::dependencies::DependencyScanningTool &clangScanningTool, InterfaceSubContextDelegate &delegate, diff --git a/include/swift/Sema/SourceLoader.h b/include/swift/Sema/SourceLoader.h index d899a011908fc..45b0baca5a576 100644 --- a/include/swift/Sema/SourceLoader.h +++ b/include/swift/Sema/SourceLoader.h @@ -100,7 +100,6 @@ class SourceLoader : public ModuleLoader { llvm::SmallVector, 1> getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath, - llvm::IntrusiveRefCntPtr CacheFS, const llvm::DenseSet &alreadySeenClangModules, clang::tooling::dependencies::DependencyScanningTool &clangScanningTool, InterfaceSubContextDelegate &delegate, diff --git a/include/swift/Serialization/SerializedModuleLoader.h b/include/swift/Serialization/SerializedModuleLoader.h index abb2bd8388f04..6b9a798761922 100644 --- a/include/swift/Serialization/SerializedModuleLoader.h +++ b/include/swift/Serialization/SerializedModuleLoader.h @@ -258,7 +258,6 @@ class SerializedModuleLoaderBase : public ModuleLoader { virtual llvm::SmallVector, 1> getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath, - llvm::IntrusiveRefCntPtr CacheFS, const llvm::DenseSet &alreadySeenClangModules, clang::tooling::dependencies::DependencyScanningTool &clangScanningTool, InterfaceSubContextDelegate &delegate, diff --git a/lib/AST/ModuleDependencies.cpp b/lib/AST/ModuleDependencies.cpp index 6ec798a479bf2..718e81c7b8cd0 100644 --- a/lib/AST/ModuleDependencies.cpp +++ b/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) { diff --git a/lib/ClangImporter/ClangModuleDependencyScanner.cpp b/lib/ClangImporter/ClangModuleDependencyScanner.cpp index 514c0ca9ac22b..ee4a22693952f 100644 --- a/lib/ClangImporter/ClangModuleDependencyScanner.cpp +++ b/lib/ClangImporter/ClangModuleDependencyScanner.cpp @@ -421,7 +421,6 @@ computeClangWorkingDirectory(const std::vector &commandLineArgs, ModuleDependencyVector ClangImporter::getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath, - llvm::IntrusiveRefCntPtr CacheFS, const llvm::DenseSet &alreadySeenClangModules, clang::tooling::dependencies::DependencyScanningTool &clangScanningTool, InterfaceSubContextDelegate &delegate, diff --git a/lib/DependencyScan/ModuleDependencyScanner.cpp b/lib/DependencyScan/ModuleDependencyScanner.cpp index d109ab3486b37..a3bb3db7395b0 100644 --- a/lib/DependencyScan/ModuleDependencyScanner.cpp +++ b/lib/DependencyScan/ModuleDependencyScanner.cpp @@ -218,7 +218,6 @@ ModuleDependencyScanningWorker::scanFilesystemForModuleDependency( ModuleDependencyVector moduleDependencies = swiftScannerModuleLoader->getModuleDependencies( moduleName, cache.getModuleOutputPath(), - cache.getScanService().getCachingFS(), cache.getAlreadySeenClangModules(), clangScanningTool, *scanningASTDelegate, cache.getScanService().getPrefixMapper(), isTestableImport); @@ -226,7 +225,6 @@ ModuleDependencyScanningWorker::scanFilesystemForModuleDependency( if (moduleDependencies.empty()) moduleDependencies = clangScannerModuleLoader->getModuleDependencies( moduleName, cache.getModuleOutputPath(), - cache.getScanService().getCachingFS(), cache.getAlreadySeenClangModules(), clangScanningTool, *scanningASTDelegate, cache.getScanService().getPrefixMapper(), isTestableImport); @@ -239,9 +237,8 @@ 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 @@ -249,9 +246,8 @@ 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 diff --git a/lib/Sema/SourceLoader.cpp b/lib/Sema/SourceLoader.cpp index 5efd2ba259c04..c16c489ecda86 100644 --- a/lib/Sema/SourceLoader.cpp +++ b/lib/Sema/SourceLoader.cpp @@ -157,7 +157,6 @@ void SourceLoader::loadExtensions(NominalTypeDecl *nominal, ModuleDependencyVector SourceLoader::getModuleDependencies(Identifier moduleName, StringRef moduleOutputPath, - llvm::IntrusiveRefCntPtr CacheFS, const llvm::DenseSet &alreadySeenClangModules, clang::tooling::dependencies::DependencyScanningTool &clangScanningTool, InterfaceSubContextDelegate &delegate, diff --git a/lib/Serialization/ScanningLoaders.cpp b/lib/Serialization/ScanningLoaders.cpp index 50a0d4781e00d..465501708aa13 100644 --- a/lib/Serialization/ScanningLoaders.cpp +++ b/lib/Serialization/ScanningLoaders.cpp @@ -311,7 +311,6 @@ SwiftModuleScanner::scanInterfaceFile(Twine moduleInterfacePath, ModuleDependencyVector SerializedModuleLoaderBase::getModuleDependencies( Identifier moduleName, StringRef moduleOutputPath, - llvm::IntrusiveRefCntPtr CacheFS, const llvm::DenseSet &alreadySeenClangModules, clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,