averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +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

38
tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp
View File

@@ -224,25 +224,33 @@ static void indexModule(llvm::MemoryBuffer *Input,
// FIXME: These APIs allocate memory on the ASTContext, meaning it may not
// be freed for a long time.
Mod = ModuleDecl::create(Ctx.getIdentifier(ModuleName), Ctx);
// Indexing is not using documentation now, so don't open the module
// documentation file.
// FIXME: refactor the frontend to provide an easy way to figure out the
// correct filename here.
auto FUnit = Loader->loadAST(*Mod, std::nullopt, /*moduleInterfacePath=*/"",
/*moduleInterfaceSourcePath=*/"",
std::move(Buf), nullptr, nullptr,
/*isFramework=*/false);
Mod = ModuleDecl::create(Ctx.getIdentifier(ModuleName), Ctx,
[&](ModuleDecl *Mod, auto addFile) {
// Indexing is not using documentation now, so don't open the module
// documentation file.
// FIXME: refactor the frontend to provide an easy way to figure out
// the correct filename here.
auto FUnit =
Loader->loadAST(*Mod, std::nullopt, /*moduleInterfacePath=*/"",
/*moduleInterfaceSourcePath=*/"", std::move(Buf),
nullptr, nullptr,
/*isFramework=*/false);
// FIXME: Not knowing what went wrong is pretty bad. loadModule() should be
// more modular, rather than emitting diagnostics itself.
if (!FUnit) {
if (!FUnit) {
Mod->setFailedToLoad();
return;
}
addFile(FUnit);
Mod->setHasResolvedImports();
});
// FIXME: Not knowing what went wrong is pretty bad. loadModule()
// should be more modular, rather than emitting diagnostics itself.
if (Mod->failedToLoad()) {
IdxConsumer.failed("failed to load module");
return;
}
Mod->addFile(*FUnit);
Mod->setHasResolvedImports();
}
SKIndexDataConsumer IdxDataConsumer(IdxConsumer);