cache associated classfile of tasty

Author: bishabosha

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

@@ -272,6 +272,19 @@ object Contexts {
     /** AbstractFile with given path, memoized */
     def getFile(name: String): AbstractFile = getFile(name.toTermName)
 
+    def getSiblingClassfile(tastyFile: AbstractFile): AbstractFile =
+      base.siblingClassfiles.getOrElseUpdate(tastyFile, {
+        val classfile0 = tastyFile.resolveSibling(tastyFile.name.stripSuffix(".tasty") + ".class")
+        if classfile0 == null then
+          val classfile = tastyFile.resolveSibling(tastyFile.name.stripSuffix(".tasty") + "$.class")
+          if classfile == null then
+            NoAbstractFile
+          else
+            classfile
+        else
+          classfile0
+      })
+
     private var related: SimpleIdentityMap[Phase | SourceFile, Context] | Null = null
 
     private def lookup(key: Phase | SourceFile): Context | Null =
@@ -948,6 +961,7 @@ object Contexts {
     /** Sources and Files that were loaded */
     val sources: util.HashMap[AbstractFile, SourceFile] = util.HashMap[AbstractFile, SourceFile]()
     val files: util.HashMap[TermName, AbstractFile] = util.HashMap()
+    val siblingClassfiles: util.HashMap[AbstractFile, AbstractFile] = util.HashMap()
 
     // Types state
     /** A table for hash consing unique types */
@@ -1052,6 +1066,7 @@ object Contexts {
       errorTypeMsg.clear()
       sources.clear()
       files.clear()
+      siblingClassfiles.clear()
       comparers.clear()  // forces re-evaluation of top and bottom classes in TypeComparer
 
     // Test that access is single threaded

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

@@ -432,10 +432,9 @@ class TastyLoader(val tastyFile: AbstractFile) extends SymbolLoader {
 
 
   private def checkTastyUUID(tastyFile: AbstractFile, tastyBytes: Array[Byte])(using Context): Unit =
-    var classfile = tastyFile.resolveSibling(tastyFile.name.stripSuffix(".tasty") + ".class")
-    if classfile == null then
-      classfile = tastyFile.resolveSibling(tastyFile.name.stripSuffix(".tasty") + "$.class")
-    if classfile != null then
+    import dotty.tools.io.NoAbstractFile
+    val classfile = ctx.getSiblingClassfile(tastyFile)
+    if classfile != NoAbstractFile then
       val tastyUUID = new TastyHeaderUnpickler(tastyBytes).readHeader()
       new ClassfileTastyUUIDParser(classfile)(ctx).checkTastyUUID(tastyUUID)
     else

compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

@@ -21,7 +21,7 @@ import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.util.{SrcPos, NoSourcePosition}
 import dotty.tools.io
-import dotty.tools.io.{AbstractFile, PlainFile, ZipArchive}
+import dotty.tools.io.{AbstractFile, PlainFile, ZipArchive, NoAbstractFile}
 import xsbti.UseScope
 import xsbti.api.DependencyContext
 import xsbti.api.DependencyContext._
@@ -462,8 +462,8 @@ class DependencyRecorder {
       // Cannot ignore inheritance relationship coming from the same source (see sbt/zinc#417)
       def allowLocal = dep.context == DependencyByInheritance || dep.context == LocalDependencyByInheritance
       if depFile.isTastyExtension then
-        val depClassFile = depFile.resolveSibling(depFile.name.stripSuffix(".tasty") + ".class")
-        if depClassFile != null then
+        val depClassFile = ctx.getSiblingClassfile(depFile)
+        if depClassFile != NoAbstractFile then
           // did not find associated class file, e.g. for a TASTy-only classpath.
           // The file that Zinc recieves with binaryDependency is used to lookup any either any
           // generated non-local classes or produced xsbti.API associated with the file.

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

@@ -253,7 +253,7 @@ abstract class AbstractFile extends Iterable[AbstractFile] {
   /** Returns the sibling abstract file in the parent of this abstract file or directory.
    *  If there is no such file, returns `null`.
    */
-  def resolveSibling(name: String): AbstractFile | Null =
+  final def resolveSibling(name: String): AbstractFile | Null =
     container.lookupName(name, directory = false)
 
   private def fileOrSubdirectoryNamed(name: String, isDir: Boolean): AbstractFile =

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

@@ -72,8 +72,7 @@ abstract class ZipArchive(override val jpath: JPath, release: Option[String]) ex
     // have to keep this name for compat with sbt's compiler-interface
     def getArchive: ZipFile = null
     override def underlyingSource: Option[ZipArchive] = Some(self)
-    override def resolveSibling(name: String): AbstractFile =
-      parent.lookupName(name, directory = false)
+    override def container: Entry = parent
     override def toString: String = self.path + "(" + path + ")"
   }