Merge pull request #4263 from dotty-staging/cleanups

Small cleanups

Author: nicolasstucki

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

@@ -382,10 +382,6 @@ object Phases {
     override def toString = phaseName
   }
 
-  trait NeedsCompanions {
-    def isCompanionNeeded(cls: ClassSymbol)(implicit ctx: Context): Boolean
-  }
-
   /** Replace all instances of `oldPhaseClass` in `current` phases
    *  by the result of `newPhases` applied to the old phase.
    */

compiler/src/dotty/tools/dotc/transform/UnusedDecls.scala renamed to compiler/src/dotty/tools/dotc/transform/ErasedDecls.scala

@@ -11,7 +11,7 @@ import dotty.tools.dotc.ast.{Trees, tpd}
 import scala.collection.{ mutable, immutable }
 import mutable.ListBuffer
 import core._
-import dotty.tools.dotc.core.Phases.{NeedsCompanions, Phase}
+import dotty.tools.dotc.core.Phases.Phase
 import Types._, Contexts._, Constants._, Names._, NameOps._, Flags._, DenotTransformers._
 import SymDenotations._, Symbols._, StdNames._, Annotations._, Trees._, Scopes._, Denotations._
 import TypeErasure.{ valueErasure, ErasedValueType }

compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala

@@ -4,7 +4,6 @@ package transform
 import core._
 import Names._
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Phases.NeedsCompanions
 import dotty.tools.dotc.transform.MegaPhase._
 import ast.Trees._
 import ast.untpd
@@ -30,7 +29,6 @@ object FirstTransform {
 
 
 /** The first tree transform
- *   - ensures there are companion objects for all classes except module classes
  *   - eliminates some kinds of trees: Imports, NamedArgs
  *   - stubs out native methods
  *   - eliminates self tree in Template and self symbol in ClassInfo
@@ -45,18 +43,6 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
 
   override def phaseName = FirstTransform.name
 
-  private[this] var addCompanionPhases: List[NeedsCompanions] = _
-
-  override def changesMembers = true // the phase adds companion objects
-
-  def needsCompanion(cls: ClassSymbol)(implicit ctx: Context) =
-    addCompanionPhases.exists(_.isCompanionNeeded(cls))
-
-  override def prepareForUnit(tree: Tree)(implicit ctx: Context) = {
-    addCompanionPhases = ctx.phasePlan.flatMap(_ collect { case p: NeedsCompanions => p })
-    ctx
-  }
-
   /** eliminate self symbol in ClassInfo */
   override def transformInfo(tp: Type, sym: Symbol)(implicit ctx: Context): Type = tp match {
     case tp @ ClassInfo(_, _, _, _, self: Symbol) =>

compiler/src/dotty/tools/dotc/transform/FirstTransform.scala

@@ -2,7 +2,6 @@ package dotty.tools.dotc
 package transform
 
 import dotty.tools.dotc.core.Annotations.Annotation
-import dotty.tools.dotc.core.Phases.NeedsCompanions
 
 import scala.collection.mutable
 import core._