[Macros] Create plugin search lookup table. #66722
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci Please smoke test |
rintaro
commented
Jun 16, 2023
lib/AST/PluginLoader.cpp
Outdated
| const PluginLoader::PluginEntry & | ||
| PluginLoader::lookupPluginByModuleName(Identifier moduleName) { | ||
| auto &map = getPluginMap(); | ||
| auto found = getPluginMap().find(moduleName); |
There was a problem hiding this comment.
Suggested change
| auto found = getPluginMap().find(moduleName); | |
| auto found = map.find(moduleName); |
rintaro
force-pushed
the
macros-pluginloader-table
branch
from
5ba7f10 to
16386aa
Compare
|
@swift-ci Please smoke test |
bnbarham
reviewed
Jun 16, 2023
include/swift/AST/PluginLoader.h
Outdated
| @@ -28,6 +28,10 @@ class ASTContext; | |||
| /// * Load plugins resolving VFS paths | |||
| /// * Track plugin dependencies | |||
| class PluginLoader { | |||
| public: | |||
| using PluginEntry = std::pair<StringRef, StringRef>; | |||
There was a problem hiding this comment.
Thought's on making this its own type?
struct PluginEntry {
StringRef libPath;
StringRef executablePath;
};
lib/AST/PluginLoader.cpp
Outdated
| auto fs = Ctx.SourceMgr.getFileSystem(); | ||
|
|
||
| // Look for 'lib${module name}(.dylib|.so)'. | ||
| /// Get plug module name from \p path if the path looks like a shared library |
There was a problem hiding this comment.
Suggested change
| /// Get plug module name from \p path if the path looks like a shared library | |
| /// Get plugin module name from \p path if the path looks like a shared library |
lib/AST/PluginLoader.cpp
Outdated
Comment on lines
52
to
53
| // FIXME: layering violation / circular linkage. | ||
| // libAST should not call libParse. |
There was a problem hiding this comment.
To expand on this - sure, we might have an identifier in the map that isn't a valid. But we wouldn't be able to look it up, so it seems harmless to me.
rintaro
force-pushed
the
macros-pluginloader-table
branch
from
16386aa to
4ca6bac
Compare
|
@swift-ci Please smoke test |
rintaro
force-pushed
the
macros-pluginloader-table
branch
from
4ca6bac to
a27646f
Compare
|
@swift-ci Please smoke test |
Iterating all options and potential file system access is not great for every plugin lookup request. Instead, lazily create a single lookup table keyed by module name.
rintaro
force-pushed
the
macros-pluginloader-table
branch
from
a27646f to
b8a073c
Compare
|
@swift-ci Please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Iterating all options and potential file system access is not great for every plugin lookup request. Instead, lazily create a single lookup table keyed by module name.