Prepare to disable parser lookup #34158
Merged
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
|
@swift-ci Please test |
|
@swift-ci Please test source compatibility |
slavapestov
force-pushed
the
prepare-to-disable-parser-lookup
branch
from
10e85a8 to
5457b1a
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
|
@swift-ci Please smoke test |
…PatternEntryDeclScope
…rnEntryDeclScope Today, the reported source range of a GuardStmtScope is just that of the statement itself, ending after the 'else' block. Similarly, a PatternEntryDeclScope ends immediately after the initializer expression. Since these scopes introduce names until the end of the parent BraceStmt (meaning they change the insertion point), we were relying on the addition of child scopes to extend the source range. While we still need the hack for extending source ranges to deal with string interpolation, at least in the other cases we can get rid of it. Note that this fixes a bug where a GuardStmtScope would end before an inactive '#if' block if the inactive '#if' block was the last element of a BraceStmt.
slavapestov
force-pushed
the
prepare-to-disable-parser-lookup
branch
from
5457b1a to
e5c813a
Compare
|
@swift-ci Please smoke test |
Another spot where we have to check for redeclaration manually now. As before, we can use the existing mechanism though.
This is for re-enabling it once it is turned off by default.
I created a second copy of each test where the output changes after disabling parser lookup. The primary copy now explicitly calls the frontend with -disable-parser-lookup and expects the new diagnostics; the *_parser_lookup.swift version calls the frontend with -enable-parser-lookup and has the old expectations. This allows us to turn parser lookup on and off by default without disturbing tests. Once parser lookup is completely removed we can remove the *_parser_lookup.swift variants.
slavapestov
force-pushed
the
prepare-to-disable-parser-lookup
branch
from
e5c813a to
bd36100
Compare
|
@swift-ci Please smoke test |
davidungar
reviewed
Oct 3, 2020
Comment on lines
+858
to
+863
| insertionPoint = | ||
| ifUniqueConstructExpandAndInsert<PatternEntryDeclScope>( | ||
| insertionPoint, patternBinding, i, | ||
| isLocalBinding, endLocForBinding) | ||
| .getPtrOr(insertionPoint); | ||
|
|
There was a problem hiding this comment.
Glad we spoke about this offline. Makes perfect sense.
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.
This PR includes the final set of fixes before all remaining test failures are diagnostics changes. It also adds an
-enable-parser-lookupflag to complement the existing-disable-parser-lookup; it becomes useful once the default is to disable parser lookup.To deal with the test output differences, I created a second copy of each test where the output changes after disabling parser lookup. The primary copy now explicitly calls the frontend with
-disable-parser-lookupand expects the new diagnostics; the*_parser_lookup.swiftversion calls the frontend with-enable-parser-lookupand has the old expectations.This allows us to turn parser lookup on and off by default without disturbing tests. Once parser lookup is completely removed we can remove the
*_parser_lookup.swiftvariants.Note: Parser lookup remains enabled by default with this PR, except for the handful of tests where it is now explicitly disabled.
This PR builds upon #34135.