summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-03-01 16:43:08 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-03-01 16:43:08 -0800
commitc4eede47d7de2af0f31b344bef5c5d7ee6739d27 (patch)
treee2a4b151959fd1038909f9a4e6708f37c784340c /src/compiler
parent4d1a1f7ee596fcec4fe51a505aceb323710d893f (diff)
parent204b2b45a83cf057b6ece7a25ea4f15ec38b4a3f (diff)
downloadscala-c4eede47d7de2af0f31b344bef5c5d7ee6739d27.tar.gz
scala-c4eede47d7de2af0f31b344bef5c5d7ee6739d27.tar.bz2
scala-c4eede47d7de2af0f31b344bef5c5d7ee6739d27.zip
Merge pull request #2167 from retronym/ticket/7126
SI-7126 Account for the alias types that don't dealias.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index cff3f4f0fa..4fb68fc2a9 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -222,8 +222,13 @@ trait Typers extends Modes with Adaptations with Tags {
new SubstWildcardMap(tparams).apply(tp)
case TypeRef(_, sym, _) if sym.isAliasType =>
val tp0 = tp.dealias
- val tp1 = dropExistential(tp0)
- if (tp1 eq tp0) tp else tp1
+ if (tp eq tp0) {
+ debugwarn(s"dropExistential did not progress dealiasing $tp, see SI-7126")
+ tp
+ } else {
+ val tp1 = dropExistential(tp0)
+ if (tp1 eq tp0) tp else tp1
+ }
case _ => tp
}