diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-12-13 13:21:54 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-12-13 15:14:23 +0100 |
| commit | b350d209a20ebdf583d1dd2d3fdcd3be5073d2ef (patch) | |
| tree | 6a607e7eb4a375d3b01b2700e267848a6cef13bf /src/dotty/tools/dotc/core/unpickleScala2 | |
| parent | 88f24efb2858f46c146214bc7e51f5de17c31bc0 (diff) | |
| download | dotty-b350d209a20ebdf583d1dd2d3fdcd3be5073d2ef.tar.gz dotty-b350d209a20ebdf583d1dd2d3fdcd3be5073d2ef.tar.bz2 dotty-b350d209a20ebdf583d1dd2d3fdcd3be5073d2ef.zip | |
Perform variance adaptation only when needed in isSubType
Previously adaptIfHK was performed on every type application. This made
t3152 fail. We now do this only on demand, in isSubType. t3152 now passes
again. But the change unmasked another error, which makes Iter2 fail to compile.
Diffstat (limited to 'src/dotty/tools/dotc/core/unpickleScala2')
| -rw-r--r-- | src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index b0e31202f..618e3ceea 100644 --- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -715,7 +715,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas else TypeRef(pre, sym.name.asTypeName) val args = until(end, readTypeRef) if (sym == defn.ByNameParamClass2x) ExprType(args.head) - else if (args.nonEmpty) tycon.safeAppliedTo(adaptArgs(sym.typeParams, args)) + else if (args.nonEmpty) tycon.safeAppliedTo(etaExpandIfHK(sym.typeParams, args)) else if (sym.typeParams.nonEmpty) tycon.EtaExpand(sym.typeParams) else tycon case TYPEBOUNDStpe => |