ASTScope: Pre-compute the right source ranges instead of relying on widening #34205
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
slavapestov
force-pushed
the
astscope-source-range-fixes
branch
from
0397f93 to
9cf355e
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
davidungar
approved these changes
Oct 6, 2020
|
@swift-ci Please test source compatibility |
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
|
@swift-ci Please smoke test Linux |
The source range needs to contain the argument expression.
The source range needs to contain any attributes on the subscript declaration, since those might create child scopes (@_specialize, property wrappers, etc).
The top-level scope for a conditional clause with a pattern is now ConditionalClausePatternUseScope, which introduces the pattern's bindings. Since the patterns are not visible in their own initializer, a new ConditionalClauseInitializerScope is used for the initializer. While it is nested inside of the ConditionalClausePatternUseScope, it's lookup parent skips one level, giving us the desired behavior.
Top-level code can contain guard statements which introduce bindings until the end of the parent scope, so plumb that through.
A SourceFile might contain TopLevelCodeDecls with guard statements, which introduce names until the end of the file, so plumb that through.
slavapestov
force-pushed
the
astscope-source-range-fixes
branch
from
9cf355e to
b8cccb1
Compare
|
@swift-ci Please test source compatibility |
|
@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.
Today, if the source range of a child scope extends beyond the bounds of the parent, we automatically extend the source range of the parent. This PR fixes the handful of scope implementations which relied on this behavior to compute their complete source range up-front.
Also, in a few places in the parser, we recover from a missing BraceStmt by creating a new, empty BraceStmt whose source location is where the brace was expected to be seen. This can overlap with a scope created for the following statement, though. To avoid violating invariants, we now skip creating a BraceStmtScope entirely if the corresponding BraceStmt is empty. Not only is this a small optimization, it also avoids creating the scope in the invalid case.