diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-07-11 17:02:16 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-07-11 17:47:23 +0200 |
| commit | 6d7bc4996d6ad2095442ebc43f59307448226fd7 (patch) | |
| tree | 7cee580a3dce11cb59d232c435e90660f3dee6ea /src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | |
| parent | a200695677237922fdf6f995c690cb0108ec2fc4 (diff) | |
| download | dotty-6d7bc4996d6ad2095442ebc43f59307448226fd7.tar.gz dotty-6d7bc4996d6ad2095442ebc43f59307448226fd7.tar.bz2 dotty-6d7bc4996d6ad2095442ebc43f59307448226fd7.zip | |
Address reviewers comments
Diffstat (limited to 'src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index e8f3d63a9..3dbeb4040 100644 --- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -134,7 +134,7 @@ object Scala2Unpickler { denot.info = ClassInfo( // final info, except possibly for typeparams ordering denot.owner.thisType, denot.classSymbol, parentRefs, decls, ost) - denot.updateTypeParams(tparams) + denot.ensureTypeParamsInCorrectOrder() } } @@ -733,7 +733,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(etaExpandIfHK(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 => |