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

[Dependency Scanning] Refactor primary scan operations into 'ModuleDependencyScanner' class

Browse Source 
From being a scattered collection of 'static' methods in ScanDependencies.cpp
and member methods of ASTContext. This makes 'ScanDependencies.cpp' much easier
to read, and abstracts the actual scanning logic away to a place with common
state which will make it easier to reason about in the future.
This commit is contained in:
Artem Chikin
2023-08-28 16:11:48 -07:00
parent ea0e5c3a3e
commit 6e3f896962
25 changed files with 1480 additions and 1372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/DependencyScan/ModuleDependencyCacheSerialization.cpp
View File

@@ -921,7 +921,7 @@ void ModuleDependenciesCacheSerializer::writeModuleInfo(
ModuleInfoLayout::emitRecord(
Out, ScratchRecord, AbbrCodes[ModuleInfoLayout::Code],
getIdentifier(moduleID.first), contextHashStrID,
getIdentifier(moduleID.ModuleName), contextHashStrID,
getArrayID(moduleID, ModuleIdentifierArrayKind::DependencyImports),
getArrayID(moduleID, ModuleIdentifierArrayKind::OptionalDependencyImports),
getArrayID(moduleID, ModuleIdentifierArrayKind::QualifiedModuleDependencyIDs));
@@ -1124,11 +1124,11 @@ void ModuleDependenciesCacheSerializer::collectStringsAndArrays(
addIdentifier(contextHash);
for (auto &moduleID : cache.getAllModules(contextHash)) {
auto optionalDependencyInfo =
cache.findDependency(moduleID.first, moduleID.second, contextHash);
cache.findDependency(moduleID.ModuleName, moduleID.Kind, contextHash);
assert(optionalDependencyInfo.has_value() && "Expected dependency info.");
auto dependencyInfo = optionalDependencyInfo.value();
// Add the module's name
addIdentifier(moduleID.first);
addIdentifier(moduleID.ModuleName);
// Add the module's dependencies
addStringArray(moduleID, ModuleIdentifierArrayKind::DependencyImports,
dependencyInfo->getModuleImports());
@@ -1283,8 +1283,8 @@ void ModuleDependenciesCacheSerializer::writeInterModuleDependenciesCache(
// Write the core graph
for (auto &contextHash : cache.getAllContextHashes()) {
for (auto &moduleID : cache.getAllModules(contextHash)) {
auto dependencyInfo = cache.findDependency(moduleID.first,
moduleID.second,
auto dependencyInfo = cache.findDependency(moduleID.ModuleName,
moduleID.Kind,
contextHash);
assert(dependencyInfo.has_value() && "Expected dependency info.");
writeModuleInfo(moduleID, contextHash, **dependencyInfo);