[Refactoring] Replace lifted breaks/returns with placeholder for async transform #37189
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
bnbarham
reviewed
Apr 30, 2021
And have it automatically track to the end of the token, as that's the behavior we seem to always want.
We were missing a `return` here to ignore any switch statements that don't have anything to do with the error handling.
If we're lifting them outside of the control flow structure they're dealing with, turn them into placeholders, as they will no longer perform the control flow the user is expecting. This handles: - Return statements at the top-level of the callback. - Break statements in switches that we re-write. Resolves rdar://74014897.
Make sure we match against an exact return or break in these cases, rather than a placeholder.
hamishknight
force-pushed
the
break-it-down-for-me
branch
from
9127897 to
2d75074
Compare
hamishknight
changed the title
|
@swift-ci please test |
bnbarham
approved these changes
May 4, 2021
| @@ -4680,6 +4686,7 @@ struct CallbackClassifier { | |||
| void classifySwitch(SwitchStmt *SS) { | |||
| if (!IsResultParam || singleSwitchSubject(SS) != ErrParam) { | |||
| CurrentBlock->addNode(SS); | |||
| return; | |||
There was a problem hiding this comment.
Oof. Thanks for catching this and adding the 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.
If we're lifting them outside of the control flow structure they're dealing with, turn them into placeholders, as they will no longer perform the control flow the user is expecting.
This handles:
In addition, fix a bug where we'd inadvertently transform an unrelated switch statement in the callback.
Resolves rdar://74014897.