Merge pull request #2506 from dotty-staging/fix-races

Fix race conditions due to non-volatile lazy vals

Author: DarkDimius

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

@@ -98,7 +98,7 @@ abstract class AbstractFile extends Iterable[AbstractFile] {
 
   /** Checks extension case insensitively. */
   def hasExtension(other: String) = extension == other.toLowerCase
-  private lazy val extension: String = Path.extension(name)
+  private val extension: String = Path.extension(name)
 
   /** The absolute file, if this is a relative file. */
   def absolute: AbstractFile

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

@@ -149,7 +149,7 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {
     override def sizeOption: Option[Int] = Some(zipEntry.getSize.toInt)
   }
 
-  lazy val (root, allDirs) = {
+  val (root, allDirs) = {
     val root = new DirEntry("/")
     val dirs = mutable.HashMap[String, DirEntry]("/" -> root)
     val zipFile = openZipFile()