Special-case api/impl implicit imports and verify relevant redeclarations. #3843
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
josh11b
approved these changes
Apr 3, 2024
zygoloid
approved these changes
Apr 4, 2024
toolchain/check/merge.h
Outdated
Comment on lines
18
to
19
| // typically only be used for the ImportIRId, but we only resolve that if | ||
| // needed. |
There was a problem hiding this comment.
I don't understand what the part of this second sentence after the comma is telling me. What do we only resolve if needed -- the ImportIRId? If so, what does it mean to resolve an ImportIRId?
There was a problem hiding this comment.
rephrasing: resolve that -> load it
ImportIRInstId is a reference to an ImportIRId and an InstId. Only the ImportIRId should be used in this context, but it's not actually available unless the ImportIRInst that contains the actual ImportIRId is loaded/resolved.
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.
Adds ImportIRId::ApiForImpl to reserve a specific slot for the
apiimport, so that the code can trivially determine whether an import is from the same library. This is then used for merging function declarations, because the rules for redeclarations in the same library slightly differ as compared to other imports (note they're also not identical to same-file rules).The main thing this leaves from the recent #3762 is verifying that entities forward declared in the
implfile are also defined, but that's not in-scope for merging; it's moreso post-checking validation.Note, a lot of our
invalid <entity> IDcomments in ids.h were incorrectly copy-pasted, so I've cut<entity>.