aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/pickling/UnPickler.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-02-20 09:50:07 +0100
committerMartin Odersky <odersky@gmail.com>2014-02-21 18:42:50 +0100
commit84c01ff493b81c0097d1707f64622ade028e53aa (patch)
treef08e31e36d50c41deec70c2b02285d8979acf5ee /src/dotty/tools/dotc/core/pickling/UnPickler.scala
parent889bca2de4678194ef28e24dc3513e94b5363616 (diff)
downloaddotty-84c01ff493b81c0097d1707f64622ade028e53aa.tar.gz
dotty-84c01ff493b81c0097d1707f64622ade028e53aa.tar.bz2
dotty-84c01ff493b81c0097d1707f64622ade028e53aa.zip
Reverted: Avoid using TypeBounds in alias refinements.
The idea is to use the alias itself. This cuts down on # of typebounds created and makes operations on refined infos and applied types more direct. (reverted from commit 81f31f9b71bc4466d3f04f5ce28ef94051688ecd)
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/UnPickler.scala')
-rw-r--r--src/dotty/tools/dotc/core/pickling/UnPickler.scala15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/UnPickler.scala
index e5cbdf53b..78a91b2ef 100644
--- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala
+++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala
@@ -560,16 +560,15 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot:
def elim(tp: Type): Type = tp match {
case tp @ RefinedType(parent, name) =>
val parent1 = elim(tp.parent)
- tp.compactInfo match {
+ tp.refinedInfo match {
+ case TypeAlias(info: TypeRef) if boundSyms contains info.symbol =>
+ RefinedType(parent1, name, info.symbol.info)
case info: TypeRef if boundSyms contains info.symbol =>
val info1 = info.symbol.info
- if (tp.isAliasRefinement) RefinedType(parent1, name, info1)
- else {
- assert(info1.derivesFrom(defn.SingletonClass))
- RefinedType(parent1, name, info1.mapReduceAnd(removeSingleton)(_ & _))
- }
- case cinfo =>
- tp.derivedRefinedType(parent1, name, cinfo)
+ assert(info1.derivesFrom(defn.SingletonClass))
+ RefinedType(parent1, name, info1.mapReduceAnd(removeSingleton)(_ & _))
+ case info =>
+ tp.derivedRefinedType(parent1, name, info)
}
case _ =>
tp