Swift: clean up VarDecl, NamedPattern and SwitchStmt interactions
#14567
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
* `variables` under `CaseStmt` are now AST children, which solves orphan `VarDecl`s in that case * reordered `CaseStmt` AST children to be `labels > variables > body` (was `body > labels`) * made `NamedPattern::getVarDecl` an extracted property instead of `getName` * The above led to duplicate DB entities because of a quirk in the Swift compiler code. This is solved by tweaking the extraction of `variables` under `CaseStmt` to not use `getCaseBodyVariables`.
redsun82
force-pushed
the
redsun82/swift-case-variables
branch
from
294ae67 to
2f0ee12
Compare
MathiasVP
referenced
this pull request
Oct 24, 2023
redsun82
commented
Oct 25, 2023
| @@ -1,3 +1,4 @@ | |||
| | var_decls.swift:2:7:2:7 | i | var_decls.swift:2:7:2:7 | i | | |||
There was a problem hiding this comment.
it's actually weird that this was missing! This is the for loop i variable, which is distinct from the i variable introduced after the loop.
There was a problem hiding this comment.
ah, wait, this is a parent pattern thing, I don't fully know what to make of this 😆
MathiasVP
reviewed
Oct 25, 2023
MathiasVP
force-pushed
the
redsun82/swift-case-variables
branch
from
90516d9 to
6538a76
Compare
redsun82
commented
Oct 30, 2023
|
Awesome. In that case I'll approve the merge so that we can merge it 🎉 (because the code changes LGTM as well!) |
MathiasVP
approved these changes
Oct 30, 2023
redsun82
commented
Oct 30, 2023
| # 85| [ConcreteVarDecl] b | ||
| # 85| Type = Int | ||
| # 88| [ConcreteVarDecl] a | ||
| # 88| Type = Int | ||
| # 92| [ConcreteVarDecl] x | ||
| # 92| Type = (Int) | ||
| # 95| [ConcreteVarDecl] x | ||
| # 95| Type = Int |
There was a problem hiding this comment.
still quite a number of orphaned (or maybe duplicate?) var decls here, eh?
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.
variablesunderCaseStmtare now AST children, which solves orphanVarDecls in that caseCaseStmtAST children to belabels > variables > body(wasbody > labels)NamedPattern::getVarDeclan extracted property instead ofgetNameThe above was introducing several
VarDeclduplications, asCaseStmt::getCaseBodyVariables,NamedPattern::getVarDeclandDeclRefExpr::getDeclwere all actually returning distinctVarDeclinstances. It turns out,VarDeclhas agetCanonicalVarDecl()to get the true unique variable declaration 🤷 This is now applied at a fundamental level in the the dispatcher, so that any fetching of a variable declaration done anywhere in any translator will pass through this.