averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68684 from cachemeifyoucan/eng/PR-path-remapping

Browse Source 
[CompilerCaching] Path Remapping for canonicalization
This commit is contained in:
Steven Wu
2023-10-04 12:57:27 -07:00
committed by GitHub
parent 48f3704eea 5be305e839
commit c8bc08107c
24 changed files with 264 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/DependencyScan/ModuleDependencyScanner.cpp
View File

@@ -187,14 +187,16 @@ ModuleDependencyScanningWorker::scanFilesystemForModuleDependency(
moduleName, cache.getModuleOutputPath(),
cache.getScanService().getCachingFS(),
cache.getAlreadySeenClangModules(), clangScanningTool,
*ScanningASTDelegate, isTestableImport);
*ScanningASTDelegate, cache.getScanService().getPrefixMapper(),
isTestableImport);
if (moduleDependencies.empty())
moduleDependencies = clangScannerModuleLoader->getModuleDependencies(
moduleName, cache.getModuleOutputPath(),
cache.getScanService().getCachingFS(),
cache.getAlreadySeenClangModules(), clangScanningTool,
*ScanningASTDelegate, isTestableImport);
*ScanningASTDelegate, cache.getScanService().getPrefixMapper(),
isTestableImport);
return moduleDependencies;
}
@@ -205,7 +207,8 @@ ModuleDependencyScanningWorker::scanFilesystemForSwiftModuleDependency(
return swiftScannerModuleLoader->getModuleDependencies(
moduleName, cache.getModuleOutputPath(),
cache.getScanService().getCachingFS(), cache.getAlreadySeenClangModules(),
clangScanningTool, *ScanningASTDelegate, false);
clangScanningTool, *ScanningASTDelegate,
cache.getScanService().getPrefixMapper(), false);
}
ModuleDependencyVector
@@ -214,7 +217,8 @@ ModuleDependencyScanningWorker::scanFilesystemForClangModuleDependency(
return clangScannerModuleLoader->getModuleDependencies(
moduleName, cache.getModuleOutputPath(),
cache.getScanService().getCachingFS(), cache.getAlreadySeenClangModules(),
clangScanningTool, *ScanningASTDelegate, false);
clangScanningTool, *ScanningASTDelegate,
cache.getScanService().getPrefixMapper(), false);
}
template <typename Function, typename... Args>