[NFC] Convert NameScope from struct to class #4623
Merged
Conversation
This file contains 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 is a preparation change for adding name poisoning support, which is expected to require more elaborate logic around NameScope since a name can be not defined yet, defined, or poisoned. This change has the following benefits: * names_ and name_map_ are internal to NameScope and are guaranteed to match. * extended_scopes and import_ir_scopes can not be manipulated (only new scopes can be added). * inst_id, name_id and parent_scope_id are constants. * has_error can only be mutated from false to true.
* Make EntryId a struct that inherits from IdBase. * Return ArrayRef and not const vector &. * Rename AddImportIrScope() to AddImportIRScope() to be consistent with ImportIRId and SemIR.
siddy-stack
approved these changes
Dec 4, 2024
…ope as a struct to make it simpler
…tion that generates it
jonmeow
reviewed
Dec 4, 2024
…we encounter errors before
jonmeow
approved these changes
Dec 5, 2024
Thanks @jonmeow ! |
|
Thanks for the note, I missed a button due to a GH beta UI. But also it looks like your PR is failing against trunk. The issue looks basic so I'll fix that for now; we tend to give out contributor privs to ease this workflow issue. |
Merged
via the queue into
carbon-language:trunk
with commit Dec 6, 2024
daba2c7
7 of 8 checks passed
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.
This is a preparation change for adding name poisoning support (#4622), which is expected to require more elaborate logic around NameScope since a name can be not defined yet, defined, or poisoned.
The API separates looking up a name from getting the full entry since we have cases where the entries are invalidated between the time we're looking for the name and when we access (and sometimes modify) the entry.
This change has the following benefits:
namesandname_mapare internal toNameScopeand are guaranteed to match.extended_scopesandimport_ir_scopescan not be manipulated (only new scopes can be added).inst_id,name_idandparent_scope_idare constants.has_errorcan only be mutated from false to true.