[Macros] Implement unqualified lookup for global macro-expanded peer declarations. #64065
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
hborla
force-pushed
the
global-peer-macro-lookup
branch
from
4909ee5 to
6e6ec02
Compare
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
DougGregor
approved these changes
Mar 3, 2023
lib/AST/Decl.cpp
Outdated
|
|
||
| case MacroIntroducedDeclNameKind::Arbitrary: | ||
| // Only freestanding and member macros can have arbitrary names. | ||
| assert(role == MacroRole::Member || role == MacroRole::Declaration); |
There was a problem hiding this comment.
I'd rather not have this assert; ill-formed code could trigger this unless we're blocking this function from getting called on ill-formed code, and that feels dicey.
There was a problem hiding this comment.
I replaced the assertion with a FIXME for now, and I'm working on adding support for arbitrary through this mechanism locally.
| return nullptr; | ||
| } | ||
|
|
||
| void MacroDecl::getIntroducedNames(MacroRole role, ValueDecl *attachedTo, |
There was a problem hiding this comment.
Should this somehow report to its caller when arbitrary is there?
Comment on lines
+338
to
+344
| // We do not need a fully resolved macro until expansion. Instead, we | ||
| // conservatively consider peer names for all macro declarations with a | ||
| // custom attribute name. Unqualified lookup for that name will later | ||
| // invoke expansion of the macro, and will yield no results if the resolved | ||
| // macro does not produce the requested name, so the only impact is possibly | ||
| // expanding earlier than needed / unnecessarily looking in the top-level | ||
| // auxiliary decl cache. |
…rce lookup cache, which obviously can cause request cycles.
hborla
force-pushed
the
global-peer-macro-lookup
branch
from
d554d13 to
57cca85
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.
This change adds
MacroDecl::getIntroducedNames, which populates the given vector with a list of names introduced by the macro decl. This list of macro-covered names is used in unqualified lookup to lazily expand declarations with attached macros covering a requested name. This can also be used later for name validation of attached macros.Resolves: rdar://104345950