Skip to content

Stop interning all PlainFile paths #26688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SolalPirelli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Stop interning all PlainFile paths #26688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/io/JarArchive.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import scala.jdk.CollectionConverters.*
class JarArchive private (underlying: Path, root: Directory) extends PlainDirectory(root) {
def close(): Unit = this.synchronized(jpath.getFileSystem().close())

override val path: String = underlying.path
override lazy val path: String = underlying.path
override def ext: FileExtension = underlying.ext

override def exists: Boolean = jpath.getFileSystem().isOpen() && super.exists
Expand Down
9 changes: 4 additions & 5 deletions compiler/src/dotty/tools/io/PlainFile.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,18 @@ class PlainFile(givenPath: Path) extends AbstractFile {

override def name: String = givenPath.name

// Interned for fast hashcode and equals
override val path: String = givenPath.normalize.path.intern
override lazy val path: String = givenPath.normalize.path

override def container: Option[AbstractFile] = Some(new PlainFile(givenPath.parent))
override def input: InputStream = givenPath.toFile.inputStream()
override def output: OutputStream = givenPath.toFile.outputStream()
override def toURL: Option[URL] = Some(jpath.toUri.toURL)

override def hashCode(): Int = System.identityHashCode(path)
override def equals(that: Any): Boolean = that match {
override def hashCode(): Int = path.hashCode
override def equals(that: Any): Boolean = (this `eq` that.asInstanceOf[Object]) || (that match {
case x: PlainFile => path `eq` x.path
case _ => false
}
})

/** Is this abstract file a directory? */
override val isDirectory: Boolean = givenPath.isDirectory // cached for performance on Windows
Expand Down
Loading