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

[AST] Remove ModuleDecl::addFile

Browse Source 
Rather than exposing an `addFile` member on
ModuleDecl, have the `create` members take a
lambda that populates the files for the module.
Once module construction has finished, the files
are immutable.
This commit is contained in:
Hamish Knight
2024-11-17 14:17:20 +00:00
parent 309c02410b
commit 4946c799af
25 changed files with 252 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -1635,22 +1635,25 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
assert(moduleInputBuffer);
auto M = ModuleDecl::create(moduleID.Item, Ctx);
M->setIsSystemModule(isSystemModule);
if (AllowMemoryCache)
Ctx.addLoadedModule(M);
SWIFT_DEFER { M->setHasResolvedImports(); };
LoadedFile *file = nullptr;
auto *M = ModuleDecl::create(moduleID.Item, Ctx,
[&](ModuleDecl *M, auto addFile) {
M->setIsSystemModule(isSystemModule);
if (AllowMemoryCache)
Ctx.addLoadedModule(M);
llvm::sys::path::native(moduleInterfacePath);
auto *file =
loadAST(*M, moduleID.Loc, moduleInterfacePath, moduleInterfaceSourcePath,
std::move(moduleInputBuffer), std::move(moduleDocInputBuffer),
std::move(moduleSourceInfoInputBuffer), isFramework);
if (file) {
M->addFile(*file);
} else {
M->setFailedToLoad();
}
llvm::sys::path::native(moduleInterfacePath);
file = loadAST(*M, moduleID.Loc, moduleInterfacePath,
moduleInterfaceSourcePath, std::move(moduleInputBuffer),
std::move(moduleDocInputBuffer),
std::move(moduleSourceInfoInputBuffer), isFramework);
if (file) {
addFile(file);
} else {
M->setFailedToLoad();
}
M->setHasResolvedImports();
});
if (dependencyTracker && file) {
auto DepPath = file->getFilename();
@@ -1692,25 +1695,32 @@ MemoryBufferSerializedModuleLoader::loadModule(SourceLoc importLoc,
MemoryBuffers.erase(bufIter);
assert(moduleInputBuffer);
auto *M = ModuleDecl::create(moduleID.Item, Ctx);
SWIFT_DEFER { M->setHasResolvedImports(); };
if (AllowMemoryCache)
Ctx.addLoadedModule(M);
auto *M = ModuleDecl::create(moduleID.Item, Ctx,
[&](ModuleDecl *M, auto addFile) {
if (AllowMemoryCache)
Ctx.addLoadedModule(M);
auto *file = loadAST(*M, moduleID.Loc, /*moduleInterfacePath=*/"",
/*moduleInterfaceSourcePath=*/"",
std::move(moduleInputBuffer), {}, {}, isFramework);
if (!file) {
auto *file = loadAST(*M, moduleID.Loc, /*moduleInterfacePath=*/"",
/*moduleInterfaceSourcePath=*/"",
std::move(moduleInputBuffer), {}, {}, isFramework);
if (!file) {
M->setFailedToLoad();
return;
}
addFile(file);
M->setHasResolvedImports();
});
if (M->failedToLoad()) {
Ctx.removeLoadedModule(moduleID.Item);
return nullptr;
}
// The MemoryBuffer loader is used by LLDB during debugging. Modules imported
// from .swift_ast sections are never produced from textual interfaces. By
// disabling resilience the debugger can directly access private members.
if (BypassResilience)
M->setBypassResilience();
M->addFile(*file);
return M;
}