Skip to content

Remove seen from TypeSizeAccumulator #20459

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions compiler/src/dotty/tools/dotc/core/Types.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6896,25 +6896,20 @@ object Types extends TypeUtils {
}

class TypeSizeAccumulator(using Context) extends TypeAccumulator[Int] {
var seen = util.HashSet[Type](initialCapacity = 8)
def apply(n: Int, tp: Type): Int =
if seen.contains(tp) then n
else {
seen += tp
tp match {
case tp: AppliedType =>
val tpNorm = tp.tryNormalize
if tpNorm.exists then apply(n, tpNorm)
else foldOver(n + 1, tp)
case tp: RefinedType =>
foldOver(n + 1, tp)
case tp: TypeRef if tp.info.isTypeAlias =>
apply(n, tp.superType)
case tp: TypeParamRef =>
apply(n, TypeComparer.bounds(tp))
case _ =>
foldOver(n, tp)
}
tp match {
case tp: AppliedType =>
val tpNorm = tp.tryNormalize
if tpNorm.exists then apply(n, tpNorm)
else foldOver(n + 1, tp)
case tp: RefinedType =>
foldOver(n + 1, tp)
case tp: TypeRef if tp.info.isTypeAlias =>
apply(n, tp.superType)
case tp: TypeParamRef =>
apply(n, TypeComparer.bounds(tp))
case _ =>
foldOver(n, tp)
}
}

Expand Down
24 changes: 24 additions & 0 deletions tests/pos/i15692.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
sealed trait Nat
sealed trait Succ[Prev <: Nat] extends Nat
sealed trait Zero extends Nat

class Sum[M <: Nat, N <: Nat] {
type Out <: Nat
}

object Sum {
type Aux[M <: Nat, N <: Nat, R <: Nat] = Sum[M, N] { type Out = R }

implicit def sum0[N <: Nat]: Sum.Aux[Zero, N, N] = new Sum[Zero, N] { type Out = N }
implicit def sum1[M <: Nat, N <: Nat, R <: Nat](implicit sum: Sum.Aux[M, Succ[N], R]): Sum.Aux[Succ[M], N, R] =
new Sum[Succ[M], N] { type Out = R }
}

object Test {
def main(args: Array[String]): Unit = {
type _3 = Succ[Succ[Succ[Zero]]]
type _5 = Succ[Succ[_3]]

implicitly[Sum[_3, _5]]
}
}
Loading