More accurate outer checks in patterns #9504
Merged
Conversation
This file contains 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
dwijnand
force-pushed
the
2.13/more-accurate-outer-checks-in-patterns
branch
from
67e77b9
to
5fff7dc
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@lrytz this is the last open ticket or PR for 2.13.5, but it takes time to run the community build. |
lrytz
reviewed
Feb 18, 2021
|
I'm happy to leave this until post-2.13.5 |
|
Agreed, this doesn't look ready to me: |
dwijnand
force-pushed
the
2.13/more-accurate-outer-checks-in-patterns
branch
from
5fff7dc
to
670f5c7
Compare
dwijnand
changed the title
dwijnand
force-pushed
the
2.13/more-accurate-outer-checks-in-patterns
branch
from
5bf0524
to
6a26cf3
Compare
retronym
reviewed
Feb 22, 2021
| case TypeRef(pre, _, _) if !pre.isStable => // e.g. _: Outer#Inner | ||
| false | ||
| case TypeRef(pre, sym, args) => | ||
| val testedBinderClass = testedBinder.info.upperBound.typeSymbol |
There was a problem hiding this comment.
This also works. Maybe slightly clearer than .upperBound.
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala b/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala
index c62510e5b2..894fcd834a 100644
--- a/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala
+++ b/src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala
@@ -411,7 +411,7 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging {
case TypeRef(pre, _, _) if !pre.isStable => // e.g. _: Outer#Inner
false
case TypeRef(pre, sym, args) =>
- val testedBinderClass = testedBinder.info.upperBound.typeSymbol
+ val testedBinderClass = testedBinder.info.baseClasses.find(_.isClass).getOrElse(NoSymbol)
val testedBinderType = testedBinder.info.baseType(testedBinderClass)
val testedPrefixIsExpectedTypePrefix = pre =:= testedBinderType.prefix
dwijnand
force-pushed
the
2.13/more-accurate-outer-checks-in-patterns
branch
from
6a26cf3
to
cad94ff
Compare
Avoids eliding outer checks that matter (run/t11534b.scala) and avoids emitting checks that don't (pos/t11534.scala) which avoids compiler warnings when the tested class doesn't have an outer field. The latter stops the annoying unchecked warning that appeared since a recent refactoring made `TermName` a final class.
lrytz
force-pushed
the
2.13/more-accurate-outer-checks-in-patterns
branch
from
cad94ff
to
350bbe7
Compare
dwijnand
commented
Apr 23, 2021
| withOuterTest(withOuterTest(orig)(testedBinder, parent))(testedBinder, copyRefinedType(rt, rest, scope)) | ||
| case expectedTp => | ||
| val expectedClass = expectedTp.typeSymbol | ||
| assert(!expectedClass.isRefinementClass, orig) |
There was a problem hiding this comment.
This failed, and I think it's because it's failing on xsbti.ScalaProvider with sbt.internal.inc.ScalaInstance.ScalaProvider2 @unchecked. See scala/community-build#1400 (comment). I'm going to try to fix this, but work-stealers welcome.
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.
Avoids eliding outer checks that matter (run/t11534b.scala) and
avoids emitting checks that don't (pos/t11534.scala) which avoids
compiler warnings when the tested class doesn't have an outer
field.
The latter stops the annoying unchecked warning that appeared since
a recent refactoring made TermName a final class.
Originally submitted to 2.12.x as #8261.
Fixes scala/bug#11534