-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[NFC] Add module alias map and lookup func to ASTContext #39496
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0e05d10
Add module alias map and lookup func to ASTContext
elsh fc420d0
Modify setModuleAliases and lookup
elsh b00fcdc
Update comments
elsh b5f8c79
move the lookup to the getRealName()
elsh 6b4951e
Rename lookupModuleAlias to getRealModuleName
elsh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -475,7 +475,6 @@ ModuleDecl::ModuleDecl(Identifier name, ASTContext &ctx, | |
ctx.addDestructorCleanup(*this); | ||
setImplicit(); | ||
setInterfaceType(ModuleType::get(this)); | ||
|
||
setAccess(AccessLevel::Public); | ||
|
||
Bits.ModuleDecl.StaticLibrary = 0; | ||
|
@@ -1564,6 +1563,11 @@ ImportedModule::removeDuplicates(SmallVectorImpl<ImportedModule> &imports) { | |
imports.erase(last, imports.end()); | ||
} | ||
|
||
Identifier ModuleDecl::getRealName() const { | ||
// This will return the real name for an alias (if used) or getName() | ||
return getASTContext().getRealModuleName(getName()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Cute. |
||
} | ||
|
||
Identifier ModuleDecl::getABIName() const { | ||
if (!ModuleABIName.empty()) | ||
return ModuleABIName; | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this (or something else) copy the strings storage to the AST context?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've had issues in the past with
StringRef
s parsed from arguments being lost in long running SourceKit process. I'm not sure if we could see the same thing here.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getIdentifier
allocates an entry and theModuleAliasMap
is a DenseMap so it'll be stored. Also the StringRefs in the argument map contains allocated data so they won't be lost either by the time this func is called. We could perhaps clear the argument map after the loop for better optimization if needed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good. Thanks for the details!