diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-10 11:16:41 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-10 11:16:41 -0800 |
commit | 0b77398be2fbfc9270ae8af0ef56964a5eab5537 (patch) | |
tree | 4697943eda1273fb23acc87c5d84b15c8c0147f9 | |
parent | f40541788957c257ee8b4035e0063a8a48945c11 (diff) | |
parent | bb427a34165b0338be8b23baeb61ac0591b3c0a1 (diff) | |
download | scala-0b77398be2fbfc9270ae8af0ef56964a5eab5537.tar.gz scala-0b77398be2fbfc9270ae8af0ef56964a5eab5537.tar.bz2 scala-0b77398be2fbfc9270ae8af0ef56964a5eab5537.zip |
Merge pull request #3251 from retronym/ticket/8060
SI-8060 Avoid infinite loop with higher kinded type alias
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
-rw-r--r-- | test/files/pos/t8060.scala | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index b80dcefef8..40313bdb5d 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3826,7 +3826,7 @@ trait Typers extends Modes with Adaptations with Tags { val normalizeLocals = new TypeMap { def apply(tp: Type): Type = tp match { case TypeRef(pre, sym, args) => - if (sym.isAliasType && containsLocal(tp)) apply(tp.dealias) + if (sym.isAliasType && containsLocal(tp) && (tp.dealias ne tp)) apply(tp.dealias) else { if (pre.isVolatile) InferTypeWithVolatileTypeSelectionError(tree, pre) diff --git a/test/files/pos/t8060.scala b/test/files/pos/t8060.scala new file mode 100644 index 0000000000..90e014d74b --- /dev/null +++ b/test/files/pos/t8060.scala @@ -0,0 +1,11 @@ +trait M[F[_]] + +trait P[A] { + type CC[X] = P[X] + def f(p: A => Boolean): M[CC] +} + +trait Other { + // was infinite loop trying to dealias `x$1.CC` + def g[A](p: A => Boolean): P[A] => M[P] = _ f p +} |