Remove -enable-astscope-lookup flag #33805
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 smoke test |
davidungar
approved these changes
Sep 4, 2020
Comment on lines
-678
to
-740
|
|
||
| struct AddLabeledStmt { | ||
| StmtChecker ≻ | ||
| AddLabeledStmt(StmtChecker &SC, LabeledStmt *LS) : SC(SC) { | ||
| // Verify that we don't have label shadowing. | ||
| auto sourceFile = SC.DC->getParentSourceFile(); | ||
| checkLabeledStmtShadowing(SC.getASTContext(), sourceFile, LS); | ||
|
|
||
| // In any case, remember that we're in this labeled statement so that | ||
| // break and continue are aware of it. | ||
| SC.ActiveLabeledStmts.push_back(LS); | ||
|
|
||
| // Verify that the ASTScope-based query for active labeled statements | ||
| // is equivalent to what we have here. | ||
| if (LS->getStartLoc().isValid() && sourceFile && | ||
| SC.getASTContext().LangOpts.EnableASTScopeLookup && | ||
| !SC.getASTContext().Diags.hadAnyError() && | ||
| !SC.LeaveBraceStmtBodyUnchecked) { | ||
| // The labeled statements from ASTScope lookup have the | ||
| // innermost labeled statement first, so reverse it to | ||
| // match the data structure maintained here. | ||
| auto activeFromASTScope = ASTScope::lookupLabeledStmts( | ||
| sourceFile, LS->getStartLoc()); | ||
| assert(activeFromASTScope.front() == LS); | ||
| std::reverse(activeFromASTScope.begin(), activeFromASTScope.end()); | ||
| if (activeFromASTScope != SC.ActiveLabeledStmts) { | ||
| llvm::errs() << "Old: "; | ||
| llvm::interleave(SC.ActiveLabeledStmts, [&](LabeledStmt *LS) { | ||
| llvm::errs() << LS; | ||
| }, [&] { | ||
| llvm::errs() << ' '; | ||
| }); | ||
| llvm::errs() << "\nNew: "; | ||
| llvm::interleave(activeFromASTScope, [&](LabeledStmt *LS) { | ||
| llvm::errs() << LS; | ||
| }, [&] { | ||
| llvm::errs() << ' '; | ||
| }); | ||
| llvm::errs() << "\n"; | ||
| } | ||
| assert(activeFromASTScope == SC.ActiveLabeledStmts); | ||
| } | ||
| } | ||
| ~AddLabeledStmt() { | ||
| SC.ActiveLabeledStmts.pop_back(); | ||
| } | ||
| }; | ||
|
|
||
| struct AddSwitchNest { | ||
| StmtChecker &SC; | ||
| CaseStmt *OuterFallthroughSource; | ||
| CaseStmt *OuterFallthroughDest; | ||
| AddSwitchNest(StmtChecker &SC) | ||
| : SC(SC), | ||
| OuterFallthroughSource(SC.FallthroughSource), | ||
| OuterFallthroughDest(SC.FallthroughDest) { | ||
| } | ||
|
|
||
| ~AddSwitchNest() { | ||
| SC.FallthroughSource = OuterFallthroughSource; | ||
| SC.FallthroughDest = OuterFallthroughDest; | ||
| } | ||
| }; |
There was a problem hiding this comment.
It's not obvious that this change belongs in a PR named "remove ... flag". Was it only used to cross-check ASTScopes?
There was a problem hiding this comment.
This is the old implementation of fall-through case statements. It's no longer needed since we can always use the new implementation. This change is also in a separate commit.
slavapestov
force-pushed
the
remove-enable-astscope-lookup-flag
branch
from
4369aca to
193cf0d
Compare
|
@swift-ci Please smoke test |
dabrahams
pushed a commit
that referenced
this pull request
Sep 14, 2020
-enable-astscope-lookup was removed in #33805
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.
No description provided.