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

[Macros] Load '-load-plugin-library' plugins lazily

Browse Source 
* Argument to '-load-plugin-library' now must have a filename that's
  '{libprefix}{modulename}.{sharedlibraryextension}'
* Load '-load-plugin-library' plugins are now lazily loaded in
  'CompilerPluginLoadRequest'
* Remove ASTContext.LoadedSymbols cache because they are cached by
  'ExternalMacroDefinitionRequest' anyway
* `-load-plugin-executable` format validation is now in
  'ParseSearchPathArgs'
This commit is contained in:
Rintaro Ishizaki
2023-03-23 16:42:19 -07:00
parent 2a7f985ba3
commit d8c8574e9b
6 changed files with 119 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1564,14 +1564,28 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts,
}
Opts.setCompilerPluginLibraryPaths(CompilerPluginLibraryPaths);
std::vector<std::string> CompilerPluginExecutablePaths(
std::vector<PluginExecutablePathAndModuleNames> CompilerPluginExecutablePaths(
Opts.getCompilerPluginExecutablePaths());
for (const Arg *A : Args.filtered(OPT_load_plugin_executable)) {
// NOTE: The value has '#<module names>' after the path.
// But resolveSearchPath() works as long as the value starts with a path.
CompilerPluginExecutablePaths.push_back(resolveSearchPath(A->getValue()));
// 'A' is '<path to executable>#<module names>' where the module names are
// comma separated.
StringRef path;
StringRef modulesStr;
std::tie(path, modulesStr) = StringRef(A->getValue()).rsplit('#');
std::vector<std::string> moduleNames;
for (auto name : llvm::split(modulesStr, ',')) {
moduleNames.emplace_back(name);
}
if (path.empty() || moduleNames.empty()) {
Diags.diagnose(SourceLoc(), diag::error_load_plugin_executable,
A->getValue());
} else {
CompilerPluginExecutablePaths.push_back(
{resolveSearchPath(path), std::move(moduleNames)});
}
}
Opts.setCompilerPluginExecutablePaths(CompilerPluginExecutablePaths);
Opts.setCompilerPluginExecutablePaths(
std::move(CompilerPluginExecutablePaths));
return false;
}