diff options
author | Paul Phillips <paulp@improving.org> | 2011-11-07 07:49:17 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-11-07 07:49:17 +0000 |
commit | d6f9361e4bf9ee8615d1a700963535f82580ca0d (patch) | |
tree | b4f1e39ab97d9f9fb61ecdb568825e7e754b090c | |
parent | d56a8a5d1c9e9b1b26e8a41fc426828e995ef0f7 (diff) | |
download | scala-d6f9361e4bf9ee8615d1a700963535f82580ca0d.tar.gz scala-d6f9361e4bf9ee8615d1a700963535f82580ca0d.tar.bz2 scala-d6f9361e4bf9ee8615d1a700963535f82580ca0d.zip |
Fixed hang in typechecker.
Another page in the storied history of "check the normalized type, then
act on the unnormalized type", in this case leading to a tight loop of
foreverness. Closes SI-5156, review by moors.
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 | ||||
-rw-r--r-- | test/files/pos/t5156.scala | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 75535968fd..d58df50451 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -305,7 +305,7 @@ trait Implicits { case NoPrefix => 0 case SingleType(pre, sym) => - if (sym.isPackage) 0 else complexity(tp.widen) + if (sym.isPackage) 0 else complexity(tp.normalize.widen) case TypeRef(pre, sym, args) => complexity(pre) + sum(args map complexity) + 1 case RefinedType(parents, _) => diff --git a/test/files/pos/t5156.scala b/test/files/pos/t5156.scala new file mode 100644 index 0000000000..e7912ef35c --- /dev/null +++ b/test/files/pos/t5156.scala @@ -0,0 +1,21 @@ +sealed trait HList +final case class HCons[H, T <: HList](head : H, tail : T) extends HList +case object HNil extends HList + +object HList { + type ::[H, T <: HList] = HCons[H, T] + type HNil = HNil.type + + implicit def hlistOps[L <: HList](l : L) = new { + def ::[H](h : H) : H :: L = HCons(h, l) + def last(implicit last : Last[L]) {} + } + + class Last[L <: HList] + implicit def hsingleLast[H] = new Last[H :: HNil] + implicit def hlistLast[H, T <: HList](implicit lt : Last[T]) = new Last[H :: T] + + type III = Int :: Int :: Int :: HNil + val iii : III = 0 :: 0 :: 0 :: HNil + val l = iii.last +} |