Some refactorings involvng TempInfos

Author: odersky

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -4343,9 +4343,9 @@ object Types {
   final class TempClassInfo(prefix: Type, cls: ClassSymbol, decls: Scope, selfInfo: TypeOrSymbol)
   extends CachedClassInfo(prefix, cls, Nil, decls, selfInfo) {
 
-    /** Install classinfo with known parents in `denot` s */
-    def finalize(denot: SymDenotation, parents: List[Type])(implicit ctx: Context): Unit =
-      denot.info = ClassInfo(prefix, cls, parents, decls, selfInfo)
+    /** Convert to classinfo with known parents */
+    def finalized(parents: List[Type])(implicit ctx: Context): ClassInfo =
+      ClassInfo(prefix, cls, parents, decls, selfInfo)
 
     override def derivedClassInfo(prefix: Type)(implicit ctx: Context): ClassInfo =
       if (prefix eq this.prefix) this

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

@@ -135,7 +135,7 @@ object Scala2Unpickler {
     else
       registerCompanionPair(scalacCompanion, denot.classSymbol)
 
-    tempInfo.finalize(denot, normalizedParents) // install final info, except possibly for typeparams ordering
+    denot.info = tempInfo.finalized(normalizedParents)
     denot.ensureTypeParamsInCorrectOrder()
   }
 }

compiler/src/dotty/tools/dotc/typer/Namer.scala

@@ -1208,9 +1208,7 @@ class Namer { typer: Typer =>
         }
       }
 
-      if (tempInfo == null) // Constructor has not been completed yet
-        completeConstructor(denot)
-
+      completeConstructor(denot)
       denot.info = tempInfo
 
       val parentTypes = defn.adjustForTuple(cls, cls.typeParams,
@@ -1226,8 +1224,8 @@ class Namer { typer: Typer =>
         deriver.enterDerived(impl.derived)
         original.putAttachment(Deriver, deriver)
       }
+      denot.info = tempInfo.finalized(parentTypes)
 
-      tempInfo.finalize(denot, parentTypes)
       // The temporary info can now be garbage-collected
       tempInfo = null