Links between companions after unpickling are added

3 files changed, 20 insertions, 12 deletions

diff --git a/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
index e76b2e764..552d931d7 100644
--- a/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
+++ b/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -588,9 +588,15 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
           sym.info = readType()
           ValDef(sym.asTerm, readRhs(localCtx))
         case TYPEDEF | TYPEPARAM =>
-          if (sym.isClass)
+          if (sym.isClass) {
+            val companion = sym.scalacLinkedClass
+            if (companion != NoSymbol) {
+              import transform.SymUtils._
+              if (sym is Flags.ModuleClass) sym.registerCompanionMethod(nme.COMPANION_CLASS_METHOD, companion)
+              else sym.registerCompanionMethod(nme.COMPANION_MODULE_METHOD, companion)
+            }
             ta.assignType(untpd.TypeDef(sym.name.asTypeName, readTemplate(localCtx)), sym)
-          else {
+          } else {
             sym.info = readType()
             TypeDef(sym.asType)
           }
diff --git a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
index d58122f2d..d14423b7b 100644
--- a/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
+++ b/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
@@ -117,17 +117,10 @@ object Scala2Unpickler {
     val scalacCompanion = denot.classSymbol.scalacLinkedClass
 
     def registerCompanionPair(module: Symbol, claz: Symbol) = {
-      def registerCompanionMethod(name: Name, target: Symbol, owner: Symbol) = {
-        if (!owner.unforcedDecls.lookup(name).exists) {
-          val companionMethod = ctx.synthesizeCompanionMethod(name, target, owner)
-          if (companionMethod.exists) {
-            companionMethod.entered
-          }
-        }
-      }
-      registerCompanionMethod(nme.COMPANION_CLASS_METHOD, claz, module)
+      import transform.SymUtils._
+      module.registerCompanionMethod(nme.COMPANION_CLASS_METHOD, claz)
       if (claz.isClass) {
-        registerCompanionMethod(nme.COMPANION_MODULE_METHOD, module, claz)
+        claz.registerCompanionMethod(nme.COMPANION_MODULE_METHOD, module)
       }
     }
 
diff --git a/src/dotty/tools/dotc/transform/SymUtils.scala b/src/dotty/tools/dotc/transform/SymUtils.scala
index 14f6a2e22..9d4fa9788 100644
--- a/src/dotty/tools/dotc/transform/SymUtils.scala
+++ b/src/dotty/tools/dotc/transform/SymUtils.scala
@@ -99,4 +99,13 @@ class SymUtils(val self: Symbol) extends AnyVal {
     self.addAnnotations(from.annotationsCarrying(meta))
     self
   }
+
+  def registerCompanionMethod(name: Name, target: Symbol)(implicit ctx: Context) = {
+    if (!self.unforcedDecls.lookup(name).exists) {
+      val companionMethod = ctx.synthesizeCompanionMethod(name, target, self)
+      if (companionMethod.exists) {
+        companionMethod.entered
+      }
+    }
+  }
 }