From 9c30c9b13d2eb95f4d86368ed27cf7e63e468dee Mon Sep 17 00:00:00 2001 From: VladimirNik Date: Mon, 16 Nov 2015 14:55:42 +0300 Subject: Links between companions after unpickling are added --- .../tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala') 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) } } -- cgit v1.2.3