diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-06-30 18:42:29 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-07-11 13:35:07 +0200 |
| commit | 34a068b7f6039637d6f1330e3d071f5bf75e9cec (patch) | |
| tree | ef7b435c50e4110971721836ebdaf9e0d07b4328 /src/dotty/tools/dotc/core/tasty | |
| parent | 32c0135b59fe02a70ed0b1a693251a0028d479c8 (diff) | |
| download | dotty-34a068b7f6039637d6f1330e3d071f5bf75e9cec.tar.gz dotty-34a068b7f6039637d6f1330e3d071f5bf75e9cec.tar.bz2 dotty-34a068b7f6039637d6f1330e3d071f5bf75e9cec.zip | |
Drop Config.checkKinds
Allows us to drop also the involved knownHK method. Lots of other
cleanups.
Diffstat (limited to 'src/dotty/tools/dotc/core/tasty')
| -rw-r--r-- | src/dotty/tools/dotc/core/tasty/TastyFormat.scala | 1 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/tasty/TreePickler.scala | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/tasty/TastyFormat.scala b/src/dotty/tools/dotc/core/tasty/TastyFormat.scala index d9006eda9..394d8f11a 100644 --- a/src/dotty/tools/dotc/core/tasty/TastyFormat.scala +++ b/src/dotty/tools/dotc/core/tasty/TastyFormat.scala @@ -499,7 +499,6 @@ object TastyFormat { SELFDEF | REFINEDtype => 1 case RENAMED | PARAMtype => 2 case POLYtype | METHODtype => -1 - case TYPEBOUNDS => -2 case _ => 0 } diff --git a/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/src/dotty/tools/dotc/core/tasty/TreePickler.scala index a4fdb2751..be3999533 100644 --- a/src/dotty/tools/dotc/core/tasty/TreePickler.scala +++ b/src/dotty/tools/dotc/core/tasty/TreePickler.scala @@ -158,7 +158,7 @@ class TreePickler(pickler: TastyPickler) { case ConstantType(value) => pickleConstant(value) case tpe: TypeRef if tpe.info.isAlias && tpe.symbol.is(Flags.AliasPreferred) => - pickleType(tpe.info.bounds.hi) + pickleType(tpe.superType) case tpe: WithFixedSym => val sym = tpe.symbol def pickleRef() = @@ -240,10 +240,7 @@ class TreePickler(pickler: TastyPickler) { } case tpe: TypeBounds => writeByte(TYPEBOUNDS) - withLength { - pickleType(tpe.lo, richTypes) - pickleType(tpe.hi, richTypes) - } + withLength { pickleType(tpe.lo, richTypes); pickleType(tpe.hi, richTypes) } case tpe: AnnotatedType => writeByte(ANNOTATED) withLength { pickleType(tpe.tpe, richTypes); pickleTree(tpe.annot.tree) } |