Add parentheses to newMutableSymbolMap

Author: nicolasstucki

compiler/sjs/backend/sjs/JSPrimitives.scala

@@ -59,7 +59,7 @@ class JSPrimitives(ctx: Context) extends DottyPrimitives(ctx) {
   /** Initialize the primitive map */
   private def initJSPrimitives(implicit ctx: Context): Map[Symbol, Int] = {
 
-    val primitives = newMutableSymbolMap[Int]
+    val primitives = newMutableSymbolMap[Int]()
 
     // !!! Code duplicate with DottyPrimitives
     /** Add a primitive operation to the map */

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -40,7 +40,7 @@ class GenBCode extends Phase {
   private val entryPoints = new mutable.HashSet[Symbol]()
   def registerEntryPoint(sym: Symbol) = entryPoints += sym
 
-  private val superCallsMap = newMutableSymbolMap[Set[ClassSymbol]]
+  private val superCallsMap = newMutableSymbolMap[Set[ClassSymbol]]()
   def registerSuperCall(sym: Symbol, calls: ClassSymbol) = {
     val old = superCallsMap.getOrElse(sym, Set.empty)
     superCallsMap.update(sym, old + calls)

compiler/src/dotty/tools/backend/jvm/LabelDefs.scala

@@ -120,7 +120,7 @@ class LabelDefs extends MiniPhaseTransform {
   object collectLabelDefs extends TreeMap() {
 
     // labelSymbol -> Defining tree
-    val labelDefs = Symbols.newMutableSymbolMap[Tree]
+    val labelDefs = Symbols.newMutableSymbolMap[Tree]()
 
     def clear = {
       labelDefs.clear()

compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala

@@ -128,7 +128,7 @@ class DottyPrimitives(ctx: Context) {
     implicit val ctx = this.ctx
 
     import core.Symbols.defn
-    val primitives = core.Symbols.newMutableSymbolMap[Int]
+    val primitives = core.Symbols.newMutableSymbolMap[Int]()
 
     /** Add a primitive operation to the map */
     def addPrimitive(s: Symbol, code: Int): Unit = {

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

@@ -24,7 +24,7 @@ object Comments {
     */
   class ContextDocstrings {
 
-    private[this] val _docstrings: MutableSymbolMap[Comment] = newMutableSymbolMap
+    private[this] val _docstrings: MutableSymbolMap[Comment] = newMutableSymbolMap()
 
     val templateExpander = new CommentExpander
 
@@ -180,7 +180,7 @@ object Comments {
     protected def superComment(sym: Symbol)(implicit ctx: Context): Option[String] =
       allInheritedOverriddenSymbols(sym).iterator map (x => cookedDocComment(x)) find (_ != "")
 
-    private val cookedDocComments = newMutableSymbolMap[String]
+    private val cookedDocComments = newMutableSymbolMap[String]()
 
     /** The raw doc comment of symbol `sym`, minus usecase and define sections, augmented by
      *  missing sections of an inherited doc comment.

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

@@ -741,7 +741,7 @@ object Symbols {
     }
   }
 
-  @inline def newMutableSymbolMap[T]: MutableSymbolMap[T] =
+  @inline def newMutableSymbolMap[T](): MutableSymbolMap[T] =
     new MutableSymbolMap(new java.util.IdentityHashMap[Symbol, T]())
 
 }

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

@@ -23,8 +23,8 @@ class TreePickler(pickler: TastyPickler) {
   import pickler.nameBuffer.nameIndex
   import ast.tpd._
 
-  private val symRefs = Symbols.newMutableSymbolMap[Addr]
-  private val forwardSymRefs = Symbols.newMutableSymbolMap[List[Addr]]
+  private val symRefs = Symbols.newMutableSymbolMap[Addr]()
+  private val forwardSymRefs = Symbols.newMutableSymbolMap[List[Addr]]()
   private val pickledTypes = new java.util.IdentityHashMap[Type, Any] // Value type is really Addr, but that's not compatible with null
 
   private def withLength(op: => Unit) = {

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

@@ -33,7 +33,7 @@ class Bridges(root: ClassSymbol)(implicit ctx: Context) {
   private[this] var toBeRemoved = immutable.Set[Symbol]()
   private val bridges = mutable.ListBuffer[Tree]()
   private val bridgesScope = newScope
-  private val bridgeTarget = newMutableSymbolMap[Symbol]
+  private val bridgeTarget = newMutableSymbolMap[Symbol]()
 
   /** Add a bridge between `member` and `other`, where `member` overrides `other`
    *  before erasure, if the following conditions are satisfied.

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

@@ -139,7 +139,7 @@ class ExtensionMethods extends MiniPhaseTransform with DenotTransformer with Ful
     extensionMeth
   }
 
-  private val extensionDefs = newMutableSymbolMap[mutable.ListBuffer[Tree]]
+  private val extensionDefs = newMutableSymbolMap[mutable.ListBuffer[Tree]]()
   // TODO: this is state and should be per-run
   // todo: check that when transformation finished map is empty
 

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

@@ -33,7 +33,7 @@ class NonLocalReturns extends MiniPhaseTransform { thisTransformer =>
     defn.NonLocalReturnControlType.appliedTo(argtype)
 
   /** A hashmap from method symbols to non-local return keys */
-  private val nonLocalReturnKeys = newMutableSymbolMap[TermSymbol]
+  private val nonLocalReturnKeys = newMutableSymbolMap[TermSymbol]()
 
   /** Return non-local return key for given method */
   private def nonLocalReturnKey(meth: Symbol)(implicit ctx: Context) =

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

@@ -67,7 +67,7 @@ object OverridingPairs {
     }
 
     private val subParents = {
-      val subParents = newMutableSymbolMap[BitSet]
+      val subParents = newMutableSymbolMap[BitSet]()
       for (bc <- base.info.baseClasses)
         subParents(bc) = BitSet(parents.indices.filter(parents(_).derivesFrom(bc)): _*)
       subParents

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

@@ -76,8 +76,8 @@ object PatternMatcher {
     /** A map from variable symbols to their defining trees
      *  and from labels to their defining plans
      */
-    private val initializer = newMutableSymbolMap[Tree]
-    private val labelled = newMutableSymbolMap[Plan]
+    private val initializer = newMutableSymbolMap[Tree]()
+    private val labelled = newMutableSymbolMap[Plan]()
 
     private def newVar(rhs: Tree, flags: FlagSet): TermSymbol =
       ctx.newSymbol(ctx.owner, PatMatStdBinderName.fresh(), Synthetic | Case | flags,
@@ -529,7 +529,7 @@ object PatternMatcher {
         tests1.filter { case(test, outcome) => tests2.get(test) == Some(outcome) }
 
       /** The tests with known outcomes valid at entry to label */
-      val seenAtLabel = newMutableSymbolMap[SeenTests]
+      val seenAtLabel = newMutableSymbolMap[SeenTests]()
 
       class ElimRedundant(seenTests: SeenTests) extends PlanTransform {
         override def apply(plan: TestPlan): Plan = {
@@ -609,12 +609,12 @@ object PatternMatcher {
       type SeenVars = Map[RHS, TermSymbol]
 
       /** The variables known at entry to label */
-      val seenAtLabel = newMutableSymbolMap[SeenVars]
+      val seenAtLabel = newMutableSymbolMap[SeenVars]()
 
       /** Parameters of label; these are passed additional variables
        *  which are known at all callsites.
        */
-      val paramsOfLabel = newMutableSymbolMap[SeenVars]
+      val paramsOfLabel = newMutableSymbolMap[SeenVars]()
 
       class Merge(seenVars: SeenVars) extends PlanTransform {
         override val treeMap = new TreeMap {

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

@@ -69,7 +69,7 @@ class ShortcutImplicits extends MiniPhase with IdentityDenotTransformer { thisTr
     /** A map to cache mapping local methods to their direct counterparts.
      *  A fresh map is created for each unit.
      */
-    private val directMeth = newMutableSymbolMap[Symbol]
+    private val directMeth = newMutableSymbolMap[Symbol]()
 
     /** Should `sym` get a ..$direct companion?
      *  This is the case if (1) `sym` is a method with an implicit function type as final result type.

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

@@ -65,7 +65,7 @@ class SuperAccessors(thisTransformer: DenotTransformer) {
       ctx.owner.enclosingClass != invalidEnclClass
 
     /** List buffers for new accessor definitions, indexed by class */
-    private val accDefs = newMutableSymbolMap[mutable.ListBuffer[Tree]]
+    private val accDefs = newMutableSymbolMap[mutable.ListBuffer[Tree]]()
 
     /** A super accessor call corresponding to `sel` */
     private def superAccessorCall(sel: Select)(implicit ctx: Context) = {

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

@@ -142,7 +142,7 @@ class TreeChecker extends Phase with SymTransformer {
   class Checker(phasesToCheck: Seq[Phase]) extends ReTyper with Checking {
 
     val nowDefinedSyms = new mutable.HashSet[Symbol]
-    val everDefinedSyms = newMutableSymbolMap[untpd.Tree]
+    val everDefinedSyms = newMutableSymbolMap[untpd.Tree]()
 
     // don't check value classes after typer, as the constraint about constructors doesn't hold after transform
     override def checkDerivedValueClass(clazz: Symbol, stats: List[Tree])(implicit ctx: Context) = ()

compiler/src/dotty/tools/dotc/transform/localopt/Devalify.scala

@@ -23,13 +23,13 @@ import transform.SymUtils._
 class Devalify extends Optimisation {
   import ast.tpd._
 
-  val timesUsed = newMutableSymbolMap[Int]
-  val timesUsedAsType = newMutableSymbolMap[Int]
+  val timesUsed = newMutableSymbolMap[Int]()
+  val timesUsedAsType = newMutableSymbolMap[Int]()
 
   val defined = mutable.HashSet[Symbol]()
-  val usedInInnerClass = newMutableSymbolMap[Int]
+  val usedInInnerClass = newMutableSymbolMap[Int]()
   // Either a duplicate or a read through series of immutable fields
-  val copies = newMutableSymbolMap[Tree]
+  val copies = newMutableSymbolMap[Tree]()
 
   def clear(): Unit = {
     timesUsed.clear()

compiler/src/dotty/tools/dotc/transform/localopt/InlineLabelsCalledOnce.scala

@@ -15,8 +15,8 @@ import config.Printers.simplify
 class InlineLabelsCalledOnce extends Optimisation {
   import ast.tpd._
 
-  val timesUsed = newMutableSymbolMap[Int]
-  val defined   = newMutableSymbolMap[DefDef]
+  val timesUsed = newMutableSymbolMap[Int]()
+  val defined   = newMutableSymbolMap[DefDef]()
 
   def clear(): Unit = {
     timesUsed.clear()

compiler/src/dotty/tools/dotc/transform/localopt/InlineOptions.scala

@@ -17,7 +17,7 @@ import scala.collection.mutable
 class InlineOptions extends Optimisation {
   import ast.tpd._
 
-  val somes = newMutableSymbolMap[Tree]
+  val somes = newMutableSymbolMap[Tree]()
   val nones = mutable.HashSet[Symbol]()
 
   def clear(): Unit = {

compiler/src/dotty/tools/dotc/transform/localopt/Jumpjump.scala

@@ -18,7 +18,7 @@ import core.Flags._
 class Jumpjump extends Optimisation {
   import ast.tpd._
 
-  val defined = newMutableSymbolMap[Symbol]
+  val defined = newMutableSymbolMap[Symbol]()
 
   def clear(): Unit = defined.clear()
 

compiler/src/dotty/tools/dotc/transform/localopt/RemoveUnnecessaryNullChecks.scala

@@ -24,7 +24,7 @@ import scala.collection.mutable
 
   val initializedVals = mutable.HashSet[Symbol]()
 
-  val checkGood = newMutableSymbolMap[Set[Symbol]]
+  val checkGood = newMutableSymbolMap[Set[Symbol]]()
 
   def clear(): Unit = {
     initializedVals.clear()

compiler/src/dotty/tools/dotc/transform/localopt/Valify.scala

@@ -16,13 +16,13 @@ class Valify(val simplifyPhase: Simplify) extends Optimisation {
   import ast.tpd._
 
   // Either a duplicate or a read through series of immutable fields.
-  val defined: MutableSymbolMap[ValDef] = newMutableSymbolMap
+  val defined: MutableSymbolMap[ValDef] = newMutableSymbolMap()
 
-  val firstRead: MutableSymbolMap[RefTree] = newMutableSymbolMap
+  val firstRead: MutableSymbolMap[RefTree] = newMutableSymbolMap()
 
-  val firstWrite: MutableSymbolMap[Assign] = newMutableSymbolMap
+  val firstWrite: MutableSymbolMap[Assign] = newMutableSymbolMap()
 
-  val secondWrite: MutableSymbolMap[Assign] = newMutableSymbolMap
+  val secondWrite: MutableSymbolMap[Assign] = newMutableSymbolMap()
 
   def clear(): Unit = {
     defined.clear()

compiler/src/dotty/tools/dotc/transform/localopt/Varify.scala

@@ -27,9 +27,9 @@ import scala.collection.mutable
  class Varify extends Optimisation {
   import ast.tpd._
 
-  val paramsTimesUsed = newMutableSymbolMap[Int]
+  val paramsTimesUsed = newMutableSymbolMap[Int]()
 
-  val possibleRenames = newMutableSymbolMap[Set[Symbol]]
+  val possibleRenames = newMutableSymbolMap[Set[Symbol]]()
 
   def clear(): Unit = {
     paramsTimesUsed.clear()