diff options
| author | Paul Phillips <paulp@improving.org> | 2013-06-03 21:23:30 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-06-03 21:23:30 -0700 |
| commit | 278305a7f60c46515c2133d11f7c561e972ef705 (patch) | |
| tree | 12062d7a8fce298bc5bbdb7b83fe8c930d18282b /src/reflect/scala/reflect/internal/Types.scala | |
| parent | a04977736c007fc7976c10c7fa5c74ae67902b92 (diff) | |
| download | scala-278305a7f60c46515c2133d11f7c561e972ef705.tar.gz scala-278305a7f60c46515c2133d11f7c561e972ef705.tar.bz2 scala-278305a7f60c46515c2133d11f7c561e972ef705.zip | |
Revert "SI-7517 type constructors too eagerly normalized."
This reverts commit 14534c693d2eb6acafaf8244c14b5643388fbd67.
It turns out this approach was breaking the working variations
in the submitted test case even as it was unbreaking the unworking
one, but I never managed to uncomment them. Fortunately retronym's
test case was not so lackadaisical.
Diffstat (limited to 'src/reflect/scala/reflect/internal/Types.scala')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index dfb8632968..00a929003e 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -3222,7 +3222,7 @@ trait Types if (constr.instValid) constr.inst // get here when checking higher-order subtyping of the typevar by itself // TODO: check whether this ever happens? - else if (isHigherKinded) logResult(s"Normalizing HK $this")(typeFun(params, applyArgs(params map (_.typeConstructor)))) + else if (isHigherKinded) logResult("Normalizing HK $this")(typeFun(params, applyArgs(params map (_.typeConstructor)))) else super.normalize ) override def typeSymbol = origin.typeSymbol @@ -3649,7 +3649,7 @@ trait Types def existentialAbstraction(tparams: List[Symbol], tpe0: Type): Type = if (tparams.isEmpty) tpe0 else { - val tpe = tpe0 map (_.dealias) + val tpe = normalizeAliases(tpe0) val tpe1 = new ExistentialExtrapolation(tparams) extrapolate tpe var tparams0 = tparams var tparams1 = tparams0 filter tpe1.contains |