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

Serialize explicit module dependencies in swift module files

Browse Source 
For clients, such as the debugger, who do not have access the full
output of the dependency scanner, it is a huger performance and
correctness improvement if each explicitly built Swift module not just
serialized all its Clang .pcm dependencies (via the serialized Clang
compiler invocation) but also its direct Swift module dependencies.

This patch changes the Swift module format to store the absolute path
or cas cache key for each dependency in the INPUT block, and makes
sure the deserialization makes these available to the ESML.

rdar://150969755
This commit is contained in:
Adrian Prantl
2025-09-18 16:54:54 -07:00
parent cb7ddbe9ea
commit c91211a5d2
20 changed files with 148 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -732,8 +732,8 @@ bool SerializedModuleLoaderBase::findModule(
std::unique_ptr<llvm::MemoryBuffer> *moduleBuffer,
std::unique_ptr<llvm::MemoryBuffer> *moduleDocBuffer,
std::unique_ptr<llvm::MemoryBuffer> *moduleSourceInfoBuffer,
bool isCanImportLookup, bool isTestableDependencyLookup,
bool &isFramework, bool &isSystemModule) {
std::string *cacheKey, bool isCanImportLookup,
bool isTestableDependencyLookup, bool &isFramework, bool &isSystemModule) {
// Find a module with an actual, physical name on disk, in case
// -module-alias is used (otherwise same).
//
@@ -1508,12 +1508,13 @@ bool SerializedModuleLoaderBase::canImportModule(
bool isSystemModule = false;
auto mID = path[0];
auto found = findModule(
mID, /*moduleInterfacePath=*/nullptr, &moduleInterfaceSourcePath,
&moduleInputBuffer,
/*moduleDocBuffer=*/nullptr, /*moduleSourceInfoBuffer=*/nullptr,
/*isCanImportLookup=*/true, isTestableDependencyLookup,
isFramework, isSystemModule);
auto found =
findModule(mID, /*moduleInterfacePath=*/nullptr,
&moduleInterfaceSourcePath, &moduleInputBuffer,
/*moduleDocBuffer=*/nullptr,
/*moduleSourceInfoBuffer=*/nullptr, /*cacheKey=*/nullptr,
/*isCanImportLookup=*/true, isTestableDependencyLookup,
isFramework, isSystemModule);
// If we cannot find the module, don't continue.
if (!found)
return false;
@@ -1597,6 +1598,7 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
bool isFramework = false;
bool isSystemModule = false;
std::string cacheKey;
llvm::SmallString<256> moduleInterfacePath;
llvm::SmallString<256> moduleInterfaceSourcePath;
std::unique_ptr<llvm::MemoryBuffer> moduleInputBuffer;
@@ -1606,10 +1608,9 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
// Look on disk.
if (!findModule(moduleID, &moduleInterfacePath, &moduleInterfaceSourcePath,
&moduleInputBuffer, &moduleDocInputBuffer,
&moduleSourceInfoInputBuffer,
&moduleSourceInfoInputBuffer, &cacheKey,
/*isCanImportLookup=*/false,
/*isTestableDependencyLookup=*/false,
isFramework,
/*isTestableDependencyLookup=*/false, isFramework,
isSystemModule)) {
return nullptr;
}
@@ -1635,6 +1636,7 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
}
M->setHasResolvedImports();
});
M->setCacheKey(cacheKey);
if (dependencyTracker && file) {
auto DepPath = file->getFilename();