Simplify JAR tasty loading

Author: nicolasstucki

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

@@ -436,33 +436,12 @@ class TastyLoader(val tastyFile: AbstractFile) extends SymbolLoader {
     load(root)
 
   def load(root: SymDenotation)(using Context): Unit = {
-    val tastyBytes = loadTastyBytes()
+    val tastyBytes = tastyFile.toByteArray
     val (classRoot, moduleRoot) = rootDenots(root.asClass)
     unpickleTASTY(tastyBytes, classRoot, moduleRoot)
     // TODO check TASTy UUID matches classfile
   }
 
-  def loadTastyBytes(): Array[Byte] =
-    tastyFile match { // TODO: simplify when #3552 is fixed
-      case tastyFile: io.ZipArchive#Entry => // We are in a jar
-        val stream = tastyFile.input
-        try {
-          val tastyOutStream = new ByteArrayOutputStream()
-          val buffer = new Array[Byte](1024)
-          var read = stream.read(buffer, 0, buffer.length)
-          while (read != -1) {
-            tastyOutStream.write(buffer, 0, read)
-            read = stream.read(buffer, 0, buffer.length)
-          }
-          tastyOutStream.flush()
-          tastyOutStream.toByteArray.nn
-        } finally {
-          stream.close()
-        }
-      case _ =>
-        tastyFile.toByteArray
-    }
-
   def unpickleTASTY(bytes: Array[Byte], classRoot: ClassDenotation, moduleRoot: ClassDenotation)(using Context): tasty.DottyUnpickler = {
     val unpickler = new tasty.DottyUnpickler(bytes)
     unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))(using ctx.withSource(util.NoSource))

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

@@ -946,12 +946,11 @@ class ClassfileParser(
             case None =>
               report.error(em"Could not find TASTY for $classfile")
             case Some(tastyFile) =>
-              val tastyLoader = new TastyLoader(tastyFile)
-              val tastyBytes: Array[Byte] = tastyLoader.loadTastyBytes()
               val expectedUUID =
                 val reader = new TastyReader(bytes, 0, 16)
                 new UUID(reader.readUncompressedLong(), reader.readUncompressedLong())
               val tastyUUID =
+                val tastyBytes: Array[Byte] = tastyFile.toByteArray
                 new TastyHeaderUnpickler(tastyBytes).readHeader()
               if (expectedUUID != tastyUUID)
                 report.warning(s"$classfile is out of sync with its TASTy file. Loaded TASTy file. Try cleaning the project to fix this issue", NoSourcePosition)