Make type parameter reordering generally available.

1 files changed, 3 insertions, 11 deletions

diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
index b1b229768..7a13388ae 100644
--- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
+++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
@@ -132,18 +132,10 @@ object Scala2Unpickler {
     } else {
       registerCompanionPair(scalacCompanion, denot.classSymbol)
     }
-    val declsTypeParams = denot.typeParams
-    val declsInRightOrder =
-      if (declsTypeParams.corresponds(tparams)(_.name == _.name)) decls
-      else { // create new scope with type parameters in right order
-        val decls1 = newScope
-        for (tparam <- tparams) decls1.enter(decls.lookup(tparam.name))
-        for (sym <- decls) if (!declsTypeParams.contains(sym)) decls1.enter(sym)
-        decls1
-      }
 
-    denot.info = ClassInfo( // final info
-      denot.owner.thisType, denot.classSymbol, parentRefs, declsInRightOrder, ost)
+    denot.info = ClassInfo( // final info, except possibly for typeparams ordering
+      denot.owner.thisType, denot.classSymbol, parentRefs, decls, ost)
+    denot.updateTypeParams(tparams)
   }
 }