diff options
author | Martin Odersky <odersky@gmail.com> | 2015-10-24 16:23:12 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-10-24 16:23:12 +0200 |
commit | 4f15c103cca72a0f673bbc07025120e5308360ec (patch) | |
tree | 16adba380b8270582d1306ce097eff03f98d9b80 /src | |
parent | 308e637dd35ba8c5e46c1bacf309ad2d82cd93bd (diff) | |
download | dotty-4f15c103cca72a0f673bbc07025120e5308360ec.tar.gz dotty-4f15c103cca72a0f673bbc07025120e5308360ec.tar.bz2 dotty-4f15c103cca72a0f673bbc07025120e5308360ec.zip |
Don't drop $apply when eliminating existentials in unpickler
Diffstat (limited to 'src')
-rw-r--r-- | src/dotty/tools/dotc/core/TypeApplications.scala | 2 | ||||
-rw-r--r-- | src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/TypeApplications.scala b/src/dotty/tools/dotc/core/TypeApplications.scala index f63005d8a..7274c1f70 100644 --- a/src/dotty/tools/dotc/core/TypeApplications.scala +++ b/src/dotty/tools/dotc/core/TypeApplications.scala @@ -235,7 +235,7 @@ class TypeApplications(val self: Type) extends AnyVal { } /** Same as isHK, except we classify all abstract types as HK, - * (they must be, because the are applied). This avoids some forcing and + * (they must be, because they are applied). This avoids some forcing and * CyclicReference errors of the standard isHK. */ def isKnownHK(tp: Type): Boolean = tp match { diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index af33ce3c2..e80712566 100644 --- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -620,7 +620,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas tp.derivedRefinedType(parent1, name, info) } case tp @ TypeRef(pre, tpnme.hkApply) => - elim(pre) + tp.derivedSelect(elim(pre)) case _ => tp } |