Skip to content

Commit fa7698e

Browse files
oderskyodersky
committed
Drop MutableSymbolMap as a separate class
It's now an alias of util.IdentityHashMap[Symbol, _]
1 parent c75a555 commit fa7698e

21 files changed

+116
-129
lines changed

‎compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import Symbols._
2222
import Phases._
2323

2424
import dotty.tools.dotc.util
25-
import dotty.tools.dotc.util.Spans
25+
import dotty.tools.dotc.util.{Spans, ReadOnlyMap}
2626
import dotty.tools.dotc.report
2727

2828
import Decorators._
@@ -36,7 +36,7 @@ import Names.TermName
3636
import Annotations.Annotation
3737
import Names.Name
3838

39-
class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: Map[Symbol, Set[ClassSymbol]])(using val ctx: Context) {
39+
class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: ReadOnlyMap[Symbol, Set[ClassSymbol]])(using val ctx: Context) {
4040

4141
private val desugared = new java.util.IdentityHashMap[Type, tpd.Select]
4242

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import dotty.tools.io._
3636
class GenBCode extends Phase {
3737
def phaseName: String = GenBCode.name
3838

39-
private val superCallsMap = newMutableSymbolMap[Set[ClassSymbol]]
39+
private val superCallsMap = new MutableSymbolMap[Set[ClassSymbol]]
4040
def registerSuperCall(sym: Symbol, calls: ClassSymbol): Unit = {
4141
val old = superCallsMap.getOrElse(sym, Set.empty)
4242
superCallsMap.update(sym, old + calls)
@@ -51,10 +51,8 @@ class GenBCode extends Phase {
5151
}
5252

5353
def run(using Context): Unit =
54-
new GenBCodePipeline(
55-
new DottyBackendInterface(
56-
outputDir, superCallsMap.toMap
57-
)
54+
GenBCodePipeline(
55+
DottyBackendInterface(outputDir, superCallsMap)
5856
).run(ctx.compilationUnit.tpdTree)
5957

6058

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Names.TermName, StdNames._
99
import Types.{JavaArrayType, UnspecifiedErrorType, Type}
1010
import Symbols.{Symbol, NoSymbol}
1111
import dotc.report
12+
import dotc.util.ReadOnlyMap
1213

1314
import scala.annotation.threadUnsafe
1415
import scala.collection.immutable
@@ -34,7 +35,7 @@ import scala.collection.immutable
3435
class DottyPrimitives(ictx: Context) {
3536
import dotty.tools.backend.ScalaPrimitivesOps._
3637

37-
@threadUnsafe private lazy val primitives: immutable.Map[Symbol, Int] = init
38+
@threadUnsafe private lazy val primitives: ReadOnlyMap[Symbol, Int] = init
3839

3940
/** Return the code for the given symbol. */
4041
def getPrimitive(sym: Symbol): Int = {
@@ -118,12 +119,12 @@ class DottyPrimitives(ictx: Context) {
118119
}
119120

120121
/** Initialize the primitive map */
121-
private def init: immutable.Map[Symbol, Int] = {
122+
private def init: ReadOnlyMap[Symbol, Int] = {
122123

123124
given Context = ictx
124125

125126
import Symbols.defn
126-
val primitives = Symbols.newMutableSymbolMap[Int]
127+
val primitives = Symbols.MutableSymbolMap[Int](512)
127128

128129
/** Add a primitive operation to the map */
129130
def addPrimitive(s: Symbol, code: Int): Unit = {
@@ -394,7 +395,7 @@ class DottyPrimitives(ictx: Context) {
394395
addPrimitives(DoubleClass, nme.UNARY_-, NEG)
395396

396397

397-
primitives.toMap
398+
primitives
398399
}
399400

400401
def isPrimitive(sym: Symbol): Boolean =

‎compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import Symbols._
1010
import dotty.tools.dotc.ast.tpd._
1111
import dotty.tools.backend.jvm.DottyPrimitives
1212
import dotty.tools.dotc.report
13+
import dotty.tools.dotc.util.ReadOnlyMap
1314

1415
import scala.collection.mutable
1516

@@ -55,7 +56,7 @@ class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) {
5556
import JSPrimitives._
5657
import dotty.tools.backend.ScalaPrimitivesOps._
5758

58-
private lazy val jsPrimitives: Map[Symbol, Int] = initJSPrimitives(using ictx)
59+
private lazy val jsPrimitives: ReadOnlyMap[Symbol, Int] = initJSPrimitives(using ictx)
5960

6061
override def getPrimitive(sym: Symbol): Int =
6162
jsPrimitives.getOrElse(sym, super.getPrimitive(sym))
@@ -70,9 +71,9 @@ class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) {
7071
jsPrimitives.contains(fun.symbol(using ictx)) || super.isPrimitive(fun)
7172

7273
/** Initialize the primitive map */
73-
private def initJSPrimitives(using Context): Map[Symbol, Int] = {
74+
private def initJSPrimitives(using Context): ReadOnlyMap[Symbol, Int] = {
7475

75-
val primitives = newMutableSymbolMap[Int]
76+
val primitives = MutableSymbolMap[Int]()
7677

7778
// !!! Code duplicate with DottyPrimitives
7879
/** Add a primitive operation to the map */
@@ -120,7 +121,7 @@ class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) {
120121
addPrimitive(jsdefn.ReflectSelectable_selectDynamic, REFLECT_SELECTABLE_SELECTDYN)
121122
addPrimitive(jsdefn.ReflectSelectable_applyDynamic, REFLECT_SELECTABLE_APPLYDYN)
122123

123-
primitives.toMap
124+
primitives
124125
}
125126

126127
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package core
44

55
import ast.{ untpd, tpd }
66
import Decorators._, Symbols._, Contexts._
7-
import util.SourceFile
7+
import util.{SourceFile, ReadOnlyMap}
88
import util.Spans._
99
import util.CommentParsing._
1010
import util.Property.Key
@@ -23,11 +23,11 @@ object Comments {
2323
*/
2424
class ContextDocstrings {
2525

26-
private val _docstrings: MutableSymbolMap[Comment] = newMutableSymbolMap
26+
private val _docstrings: MutableSymbolMap[Comment] = MutableSymbolMap[Comment](512) // FIXME: 2nd [Comment] needed or "not a class type"
2727

2828
val templateExpander: CommentExpander = new CommentExpander
2929

30-
def docstrings: Map[Symbol, Comment] = _docstrings.toMap
30+
def docstrings: ReadOnlyMap[Symbol, Comment] = _docstrings
3131

3232
def docstring(sym: Symbol): Option[Comment] = _docstrings.get(sym)
3333

@@ -180,7 +180,7 @@ object Comments {
180180
protected def superComment(sym: Symbol)(using Context): Option[String] =
181181
allInheritedOverriddenSymbols(sym).iterator map (x => cookedDocComment(x)) find (_ != "")
182182

183-
private val cookedDocComments = newMutableSymbolMap[String]
183+
private val cookedDocComments = MutableSymbolMap[String]()
184184

185185
/** The raw doc comment of symbol `sym`, minus usecase and define sections, augmented by
186186
* missing sections of an inherited doc comment.

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

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import reporting.Message
3030
import collection.mutable
3131
import io.AbstractFile
3232
import language.implicitConversions
33-
import util.{SourceFile, NoSource, Property, SourcePosition, SrcPos}
33+
import util.{SourceFile, NoSource, Property, SourcePosition, SrcPos, IdentityHashMap}
3434
import scala.collection.JavaConverters._
3535
import scala.annotation.internal.sharable
3636
import config.Printers.typr
@@ -495,61 +495,7 @@ object Symbols {
495495
/** The current class */
496496
def currentClass(using Context): ClassSymbol = ctx.owner.enclosingClass.asClass
497497

498-
/* Mutable map from symbols any T */
499-
class MutableSymbolMap[T](private[Symbols] val value: java.util.IdentityHashMap[Symbol, T]) extends AnyVal {
500-
501-
def apply(sym: Symbol): T = value.get(sym)
502-
503-
def get(sym: Symbol): Option[T] = Option(value.get(sym))
504-
505-
def getOrElse[U >: T](sym: Symbol, default: => U): U = {
506-
val v = value.get(sym)
507-
if (v != null) v else default
508-
}
509-
510-
def getOrElseUpdate(sym: Symbol, op: => T): T = {
511-
val v = value.get(sym)
512-
if (v != null) v
513-
else {
514-
val v = op
515-
assert(v != null)
516-
value.put(sym, v)
517-
v
518-
}
519-
}
520-
521-
def update(sym: Symbol, x: T): Unit = {
522-
assert(x != null)
523-
value.put(sym, x)
524-
}
525-
def put(sym: Symbol, x: T): T = {
526-
assert(x != null)
527-
value.put(sym, x)
528-
}
529-
530-
def -=(sym: Symbol): Unit = value.remove(sym)
531-
def remove(sym: Symbol): Option[T] = Option(value.remove(sym))
532-
533-
def contains(sym: Symbol): Boolean = value.containsKey(sym)
534-
535-
def isEmpty: Boolean = value.isEmpty
536-
537-
def clear(): Unit = value.clear()
538-
539-
def filter(p: ((Symbol, T)) => Boolean): Map[Symbol, T] =
540-
value.asScala.toMap.filter(p)
541-
542-
def iterator: Iterator[(Symbol, T)] = value.asScala.iterator
543-
544-
def keysIterator: Iterator[Symbol] = value.keySet().asScala.iterator
545-
546-
def toMap: Map[Symbol, T] = value.asScala.toMap
547-
548-
override def toString: String = value.asScala.toString()
549-
}
550-
551-
inline def newMutableSymbolMap[T]: MutableSymbolMap[T] =
552-
new MutableSymbolMap(new java.util.IdentityHashMap[Symbol, T]())
498+
type MutableSymbolMap[T] = IdentityHashMap[Symbol, T]
553499

554500
// ---- Factory methods for symbol creation ----------------------
555501
//

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class TreePickler(pickler: TastyPickler) {
4242
import pickler.nameBuffer.nameIndex
4343
import tpd._
4444

45-
private val symRefs = Symbols.newMutableSymbolMap[Addr]
46-
private val forwardSymRefs = Symbols.newMutableSymbolMap[List[Addr]]
45+
private val symRefs = Symbols.MutableSymbolMap[Addr](256)
46+
private val forwardSymRefs = Symbols.MutableSymbolMap[List[Addr]]()
4747
private val pickledTypes = util.IdentityHashMap[Type, Addr]()
4848

4949
/** A list of annotation trees for every member definition, so that later

‎compiler/src/dotty/tools/dotc/transform/AccessProxies.scala‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package dotty.tools.dotc
1+
package dotty.tools
2+
package dotc
23
package transform
34

45
import core._
@@ -23,7 +24,7 @@ abstract class AccessProxies {
2324
import AccessProxies._
2425

2526
/** accessor -> accessed */
26-
private val accessedBy = newMutableSymbolMap[Symbol]
27+
private val accessedBy = MutableSymbolMap[Symbol]()
2728

2829
/** Given the name of an accessor, is the receiver of the call to accessed obtained
2930
* as a parameterer?
@@ -35,7 +36,7 @@ abstract class AccessProxies {
3536
* So a second call of the same method will yield the empty list.
3637
*/
3738
private def accessorDefs(cls: Symbol)(using Context): Iterator[DefDef] =
38-
for (accessor <- cls.info.decls.iterator; accessed <- accessedBy.remove(accessor)) yield
39+
for (accessor <- cls.info.decls.iterator; accessed <- accessedBy.remove(accessor).toOption) yield
3940
polyDefDef(accessor.asTerm, tps => argss => {
4041
def numTypeParams = accessed.info match {
4142
case info: PolyType => info.paramNames.length

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Bridges(root: ClassSymbol, thisPhase: DenotTransformer)(using Context) {
3636
private var toBeRemoved = immutable.Set[Symbol]()
3737
private val bridges = mutable.ListBuffer[Tree]()
3838
private val bridgesScope = newScope
39-
private val bridgeTarget = newMutableSymbolMap[Symbol]
39+
private val bridgeTarget = MutableSymbolMap[Symbol]()
4040

4141
def bridgePosFor(member: Symbol): SrcPos =
4242
(if (member.owner == root && member.span.exists) member else root).srcPos

‎compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package dotty.tools.dotc
1+
package dotty.tools
2+
package dotc
23
package transform
34

45
import core._
@@ -115,13 +116,13 @@ class CompleteJavaEnums extends MiniPhase with InfoTransformer { thisPhase =>
115116
&& (((cls.owner.name eq nme.DOLLAR_NEW) && cls.owner.isAllOf(Private|Synthetic)) || cls.owner.isAllOf(EnumCase))
116117
&& cls.owner.owner.linkedClass.derivesFromJavaEnum
117118

118-
private val enumCaseOrdinals: MutableSymbolMap[Int] = newMutableSymbolMap
119+
private val enumCaseOrdinals = MutableSymbolMap[Int]()
119120

120121
private def registerEnumClass(cls: Symbol)(using Context): Unit =
121-
cls.children.zipWithIndex.foreach(enumCaseOrdinals.put)
122+
cls.children.zipWithIndex.foreach(enumCaseOrdinals.update)
122123

123124
private def ordinalFor(enumCase: Symbol): Int =
124-
enumCaseOrdinals.remove(enumCase).get
125+
enumCaseOrdinals.remove(enumCase).nn
125126

126127
/** 1. If this is an enum class, add $name and $ordinal parameters to its
127128
* parameter accessors and pass them on to the java.lang.Enum constructor.

0 commit comments

Comments
 (0)