Fix #5112: Recognize asInstanceOf around jump to default label. #5114
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
Under 4 cases, some versions of the compiler do not emit a switch match. That defeats the purpose of that test.
That shape gets produced by Scala 2.13.16+ in some cases.
Previously, we had to recognize specific shapes of case bodies in order to extract jumps to default labels. This was fragile, as changes in nsc's codegen could invalidate our assumptions. We now take a more general approach. We register the default label in the `enclosingLabelDefInfos`. Jumps to that label can therefore be handled wherever they appear inside the case bodies. We still require a specific shape to extract the *definition* of the default label in the wildcard case. This can't be helped, as far as I can tell. Ultimately, the JS code generated for the test suites is unchanged, both in 2.12 and 2.13.
sjrd
force-pushed
the
fix-switch-match-guard-bug-2.13.16
branch
from
1ad74c8 to
ee3e9a0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
And then make the whole thing much more generic, so that we will be more robust against further tweaks to nsc's codegen.
Based on #5113, but otherwise ready to review. The last commit is best reviewed with the "Hide whitespace" option.