Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Treat private as "effectively sealed" #9211

Merged
merged 1 commit into from Sep 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -121,7 +121,7 @@ trait TreeAndTypeAnalysis extends Debugging {
def enumerateChildren(sym: Symbol) = {
sym.sealedChildren.toList
.sortBy(_.sealedSortName)
.filterNot(x => x.isSealed && x.isAbstractClass && !isPrimitiveValueClass(x))
.filterNot(x => (x.isSealed || x.isPrivate) && x.isAbstractClass && !isPrimitiveValueClass(x))
}

// enumerate only direct subclasses,
Expand All @@ -147,7 +147,7 @@ trait TreeAndTypeAnalysis extends Debugging {
// all of their children must be and they cannot otherwise be created.
sym.sealedDescendants.toList
sortBy (_.sealedSortName)
filterNot (x => x.isSealed && x.isAbstractClass && !isPrimitiveValueClass(x))
filterNot (x => (x.isSealed || x.isPrivate) && x.isAbstractClass && !isPrimitiveValueClass(x))
)

List(debug.patmatResult(s"enum sealed tp=$tp, tpApprox=$tpApprox as") {
Expand Down
11 changes: 11 additions & 0 deletions test/files/pos/t6159.scala
@@ -0,0 +1,11 @@
// scalac: -Werror
trait A {
sealed abstract class X
private class X1 extends X with X2 { }
private trait X2 extends X
sealed trait X3 extends X

def f(x: X) = x match {
case _: X1 => 0
}
}