[5.9] [Walker] Don't visit VarDecls encountered in freestanding macro expansions #66224
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
Setting closure and local discriminators depends on an in-order walk of the AST. For macros, it was walking into both macro expansions and arguments. However, this doesn't work well with lazy macro expansions, and could result in some closures/local variables not getting discriminators set at all. Make the assignment of discriminators only walk macro arguments, and then lazily assign discriminators for anything within a macro expansion or in ill-formed code. This replaces the single global "next autoclosure discriminator" scheme with a per-DeclContext scheme, that is more reliable/robust, although it does mean that discriminators of closures and locals within macro expansions are dependent on ordering. That shouldn't matter, because these are local values. Fixes rdar://108682196.
…sions VarDecls are always walked via their pattern bindings, so we end up with double-visitation if we also visit them here. Fixes rdar://109376102. (cherry picked from commit 638c2cd)
|
@swift-ci please test |
nkcsgexi
approved these changes
May 30, 2023
DougGregor
deleted the
visit-var-decls-in-freestanding-expansions-once-5.9
branch
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.
with double-visitation if we also visit them in freestanding macro expansions, causing a compiler assertion.