[Sema] A couple of fixes for MiscDiagnostics on macro expansions #77479
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
hamishknight
requested review from
hborla,
xedin and
slavapestov
as code owners
hamishknight
force-pushed
the
macro-misc-diag-fixes
branch
from
af123d9
to
3d4acb0
Compare
|
Going to drop the |
|
@swift-ci please test source compatibility |
hamishknight
commented
Nov 8, 2024
Avoid walking into macro expansions for MiscDiagnostics, the expansions will instead be visited when they're type-checked on their own.
Always bothered me the constructor for ExprRewriter is buried in the middle of the class.
Attempting to expand macros in the middle of CSApply can result in attempting to run MiscDiagnostics within a closure that hasn't yet had the solution applied to the AST, which can crash the implicit-self diagnostic logic. Move the expansion to the end of CSApply such that expansions are type-checked along with local decls, ensuring it's run after the solution has been applied to the AST. rdar://138997009
hamishknight
force-pushed
the
macro-misc-diag-fixes
branch
from
3d4acb0
to
9c3b8a6
Compare
|
@swift-ci please test |
xedin
approved these changes
Nov 11, 2024
| return MacroWalking::Expansion; | ||
| // Macro expansions will be walked when they're type-checked, not as | ||
| // part of the surrounding code. | ||
| return MacroWalking::None; |
There was a problem hiding this comment.
Could you please separately evaluate whether it would be possible to subtype all of this walkers from BaseDiagnosticWalker and remove all of these overrides?
There was a problem hiding this comment.
Heh, I have that exact change in a follow-up PR :)
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.
rdar://138997009