wip 7: pickle both signatures

Author: bishabosha

compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala

@@ -90,7 +90,9 @@ class TastyPrinter(bytes: Array[Byte]) {
               printName(); printName()
             case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | BIND =>
               printName(); printTrees()
-            case REFINEDtype | TERMREFin | TYPEREFin | SELECTin =>
+            case SELECTin =>
+              printName(); printName(); printTree(); printTrees()
+            case REFINEDtype | TERMREFin | TYPEREFin =>
               printName(); printTree(); printTrees()
             case RETURN | HOLE =>
               printNat(); printTrees()

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

@@ -409,11 +409,6 @@ class TreePickler(pickler: TastyPickler) {
             case _ =>
               val sig = tree.tpe.signature
               var ename = tree.symbol.targetName
-              // val isAmbiguous =
-              //   sig != Signature.NotAMethod
-              //   && qual.tpe.nonPrivateMember(name).match
-              //     case d: MultiDenotation => d.atSignature(sig, ename).isInstanceOf[MultiDenotation]
-              //     case _ => false
               if name.isTypeName then
                 writeByte(SELECTtpt)
                 pickleNameAndSig(name, sig, ename)
@@ -424,7 +419,7 @@ class TreePickler(pickler: TastyPickler) {
                   pickleNameAndSig(name, tree.symbol.signature, ename)
                   pickleNameAndSig(name, sig, ename)
                   pickleTree(qual)
-                  if tree.symbol.exists then
+                  if tree.symbol.exists then // TODO: `1.unary_+` has no symbol
                     pickleType(tree.symbol.owner.typeRef)
                 }
           }

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -1179,13 +1179,6 @@ class TreeUnpickler(reader: TastyReader,
               val levels = readNat()
               readTerm().outerSelect(levels, SkolemType(readType()))
             case SELECTin =>
-              // tests/run/hashsetremove.scala failed
-              import java.io._
-              import java.nio.charset.StandardCharsets
-              def writeBytes( data : String, file : File ) = {
-                val target = new BufferedOutputStream( new FileOutputStream(file) );
-                try target.write(data.getBytes(StandardCharsets.UTF_8)) finally target.close;
-              }
               var symname = readName()
               var precisesig = readName() match
                 case SignedName(_, sig, _) => sig
@@ -1206,14 +1199,6 @@ class TreeUnpickler(reader: TastyReader,
                       d.atSignature(precisesig, target).isInstanceOf[MultiDenotation]
                     case _ => false
                   if isAmbiguous then
-                    // writeBytes(TastyPrinter.show(reader.bytes), new File("WOW123.txt"))
-                    // val d0 = pre.nonPrivateMember(name)
-                    // val d0_1 = d0.atSignature(sig, target)
-                    // val d0_2 = d0_1.asSeenFrom(pre)
-                    // val d1 = space.decl(name)
-                    // val d1_1 = d1.atSignature(sig, target)
-                    // val d1_2 = d1_1.asSeenFrom(pre)
-                    // report.echo(s"[$d0, $d0_1, $d0_2] [$d1, $d1_1, $d1_2]")
                     makeSelect(qual, name, space.decl(name).atSignature(sig, target).asSeenFrom(pre))
                   else
                     select(name, precisesig, target)

compiler/test/dotty/tools/dotc/FromTastyTests.scala

@@ -13,17 +13,6 @@ class FromTastyTests {
   import TestConfiguration._
   import FromTastyTests._
 
-  // @Test def posTmpTestFromTasty: Unit = {
-  //   // Can be reproduced with
-  //   // > sbt
-  //   // > scalac -Ythrough-tasty -Ycheck:all <source>
-
-  //   implicit val testGroup: TestGroup = TestGroup("posTmpTestFromTasty")
-  //   compileTastyInDir(s"tests${JFile.separator}pos-tmp", defaultOptions,
-  //     fromTastyFilter = FileFilter.exclude(TestSources.posFromTastyBlacklisted)
-  //   ).checkCompile()
-  // }
-
   @Test def posTestFromTasty: Unit = {
     // Can be reproduced with
     // > sbt

tasty/src/dotty/tools/tasty/TastyFormat.scala

@@ -806,8 +806,8 @@ object TastyFormat {
    */
   def numRefs(tag: Int): Int = tag match {
     case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | RETURN | BIND |
-         SELFDEF | REFINEDtype | TERMREFin | TYPEREFin | SELECTin | HOLE => 1
-    case RENAMED | PARAMtype => 2
+         SELFDEF | REFINEDtype | TERMREFin | TYPEREFin | HOLE => 1
+    case RENAMED | PARAMtype | SELECTin => 2
     case POLYtype | TYPELAMBDAtype | METHODtype => -1
     case _ => 0
   }