[5.9] [Sema] Catch invalid if/switch exprs in more places #68653
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
Previously we would only look through a handful of AST node types when determining if an if/switch expression is in a valid position. However this doesn't handle cases where we synthesize code around an if/switch expression, such as `init(erasing:)` calls. As such, relax the logic such that it can look through any implicit expression. rdar://113435870
Move out-of-place SingleValueStmtExpr checking into `performSyntacticExprDiagnostics`, to ensure we catch all expressions. Previously we did the walk as a part of Decl-based MiscDiagnostics, but it turns out that can miss expressions in property initializers, subscript default arguments, and custom attrs. This does mean that we'll now no longer diagnose out-of-place if/switch exprs if the expression didn't type-check, but that's consistent with the rest of MiscDiagnostics, and I don't think it will be a major issue in practice. We probably ought to consider moving this checking into PreCheckExpr, but that would require first separating out SequenceExpr folding, which has other consequences, and so I'm leaving as future work for now.
hamishknight
added
🍒 release cherry pick
|
Note we could leave 157e488 out of this cherry-pick, but I think it's low risk enough to take too, since it should only relax the out-of-place diagnostics. |
hamishknight
force-pushed
the
nestless-5.9
branch
from
5e7b70b
to
7742586
Compare
|
@swift-ci please test |
hamishknight
force-pushed
the
nestless-5.9
branch
from
7742586
to
5e7b70b
Compare
|
@swift-ci please test macOS |
airspeedswift
approved these changes
Sep 20, 2023
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.
5.9 cherry-pick of #68207