Use mutable.HashMap which is fater than j.u.HashMap

Author: liufengyun

compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala

@@ -107,14 +107,14 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
   private def mergeClassesAndSources(entries: scala.collection.Seq[ClassRepresentation]): Seq[ClassRepresentation] = {
     // based on the implementation from MergedClassPath
     var count = 0
-    val indices = new java.util.HashMap[String, Int]((entries.size * 1.25).toInt)
+    val indices = new collection.mutable.HashMap[String, Int]()
     val mergedEntries = new ArrayBuffer[ClassRepresentation](entries.size)
     for {
       entry <- entries
     } {
       val name = entry.name
-      if (indices.containsKey(name)) {
-        val index = indices.get(name)
+      if (indices.contains(name)) {
+        val index = indices(name)
         val existing = mergedEntries(index)
 
         if (existing.binary.isEmpty && entry.binary.isDefined)
@@ -123,12 +123,12 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath {
           mergedEntries(index) = ClassAndSourceFilesEntry(existing.binary.get, entry.source.get)
       }
       else {
-        indices.put(name, count)
+        indices(name) = count
         mergedEntries += entry
         count += 1
       }
     }
-    if (mergedEntries isEmpty) Nil else mergedEntries.toIndexedSeq
+    if (mergedEntries.isEmpty) Nil else mergedEntries.toIndexedSeq
   }
 
   private def getDistinctEntries[EntryType <: ClassRepresentation](getEntries: ClassPath => Seq[EntryType]): Seq[EntryType] = {

compiler/src/dotty/tools/dotc/classpath/ZipArchiveFileLookup.scala

@@ -62,7 +62,7 @@ trait ZipArchiveFileLookup[FileEntryType <: ClassRepresentation] extends Efficie
     }
 
   private def findDirEntry(pkg: PackageName): Option[archive.DirEntry] =
-    Option(archive.allDirs.get(pkg.dirPathTrailingSlash))
+    archive.allDirs.get(pkg.dirPathTrailingSlash)
 
   protected def createFileEntry(file: FileZipArchive#Entry): FileEntryType
   protected def isRequiredFileType(file: AbstractFile): Boolean

compiler/src/dotty/tools/io/ZipArchive.scala

@@ -85,7 +85,7 @@ abstract class ZipArchive(override val jpath: JPath) extends AbstractFile with E
     }
   }
 
-  private def ensureDir(dirs: java.util.Map[String, DirEntry], path: String): DirEntry =
+  private def ensureDir(dirs: mutable.Map[String, DirEntry], path: String): DirEntry =
     //OPT inlined from getOrElseUpdate; saves ~50K closures on test run.
     // was:
     // dirs.getOrElseUpdate(path, {
@@ -95,16 +95,16 @@ abstract class ZipArchive(override val jpath: JPath) extends AbstractFile with E
     //   dir
     // })
     dirs get path match {
-      case null =>
+      case Some(v) => v
+      case None    =>
         val parent = ensureDir(dirs, dirName(path))
         val dir    = new DirEntry(path, parent)
         parent.entries(baseName(path)) = dir
-        dirs.put(path, dir)
+        dirs(path) = dir
         dir
-      case v => v
     }
 
-  protected def getDir(dirs: java.util.Map[String, DirEntry], entry: ZipEntry): DirEntry = {
+  protected def getDir(dirs: mutable.Map[String, DirEntry], entry: ZipEntry): DirEntry = {
     if (entry.isDirectory) ensureDir(dirs, entry.getName)
     else ensureDir(dirs, dirName(entry.getName))
   }
@@ -149,9 +149,9 @@ final class FileZipArchive(jpath: JPath) extends ZipArchive(jpath) {
     override def sizeOption: Option[Int] = Some(zipEntry.getSize.toInt)
   }
 
-  @volatile lazy val (root, allDirs): (DirEntry, java.util.Map[String, DirEntry]) = {
+  @volatile lazy val (root, allDirs): (DirEntry, collection.Map[String, DirEntry]) = {
     val root = new DirEntry("/", null)
-    val dirs = new java.util.HashMap[String, DirEntry]; dirs.put("/", root)
+    val dirs = mutable.HashMap[String, DirEntry]("/" -> root)
     val zipFile = openZipFile()
     val entries = zipFile.entries()
 
@@ -199,7 +199,7 @@ final class FileZipArchive(jpath: JPath) extends ZipArchive(jpath) {
 final class ManifestResources(val url: URL) extends ZipArchive(null) {
   def iterator(): Iterator[AbstractFile] = {
     val root     = new DirEntry("/", null)
-    val dirs     = new java.util.HashMap[String, DirEntry]; dirs.put("/", root)
+    val dirs     = new mutable.HashMap[String, DirEntry]; dirs.put("/", root)
     val manifest = new Manifest(input)
     val iter     = manifest.getEntries().keySet().iterator().asScala.filter(_.endsWith(".class")).map(new ZipEntry(_))