Fix scala#3500: WIP

Author: nicolasstucki

compiler/src/dotty/tools/dotc/config/Printers.scala

@@ -28,7 +28,7 @@ object Printers {
   val config: Printer = noPrinter
   val transforms: Printer = noPrinter
   val cyclicErrors: Printer = noPrinter
-  val pickling: Printer = noPrinter
+  val pickling: Printer = noPrinter // new Printer
   val inlining: Printer = noPrinter
   val exhaustivity: Printer = noPrinter
   val patmatch: Printer = noPrinter

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

@@ -395,6 +395,7 @@ object TastyFormat {
   final val TYPEARGtype = 176
   final val TERMREFin = 177
   final val TYPEREFin = 178
+  final val BINDtype = 179
 
   final val firstSimpleTreeTag = UNITconst
   final val firstNatTreeTag = SHARED
@@ -601,14 +602,15 @@ object TastyFormat {
     case ANNOTATION => "ANNOTATION"
     case PRIVATEqualified => "PRIVATEqualified"
     case PROTECTEDqualified => "PROTECTEDqualified"
+    case BINDtype => "BINDtype"
   }
 
   /** @return If non-negative, the number of leading references (represented as nats) of a length/trees entry.
    *          If negative, minus the number of leading non-reference trees.
    */
   def numRefs(tag: Int) = tag match {
     case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | RETURN | BIND |
-         SELFDEF | REFINEDtype | TERMREFin | TYPEREFin => 1
+         SELFDEF | REFINEDtype | TERMREFin | TYPEREFin | BINDtype => 1
     case RENAMED | PARAMtype => 2
     case POLYtype | METHODtype | TYPELAMBDAtype => -1
     case _ => 0

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

@@ -61,7 +61,7 @@ class TastyPrinter(bytes: Array[Byte])(implicit ctx: Context) {
           tag match {
             case RENAMED =>
               printName(); printName()
-            case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | BIND =>
+            case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | BIND | BINDtype =>
               printName(); printTrees()
             case REFINEDtype =>
               printName(); printTree(); printTrees()

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

@@ -144,26 +144,14 @@ class TreePickler(pickler: TastyPickler) {
       pickleConstant(value)
     case tpe: NamedType =>
       val sym = tpe.symbol
-      def pickleDirectRef() = {
-        writeByte(if (tpe.isType) TYPEREFdirect else TERMREFdirect)
-        pickleSymRef(sym)
-      }
       if (sym.is(Flags.Package)) {
         writeByte(if (tpe.isType) TYPEREFpkg else TERMREFpkg)
         pickleName(sym.fullName)
       }
-      else if (tpe.prefix == NoPrefix)
-//        if (sym is Flags.BindDefinedType) {
-//          registerDef(sym)
-//          writeByte(BIND)
-//          withLength {
-//            pickleName(sym.name)
-//            pickleType(sym.info)
-//            pickleDirectRef()
-//          }
-//        }
-//        else
-          pickleDirectRef()
+      else if (tpe.prefix == NoPrefix) {
+        writeByte(if (tpe.isType) TYPEREFdirect else TERMREFdirect)
+        pickleSymRef(sym)
+      }
       else if (isLocallyDefined(sym)) {
         writeByte(if (tpe.isType) TYPEREFsymbol else TERMREFsymbol)
         pickleSymRef(sym); pickleType(tpe.prefix)
@@ -407,7 +395,8 @@ class TreePickler(pickler: TastyPickler) {
           withLength { pickleTree(call); pickleTree(expansion); bindings.foreach(pickleTree) }
         case Bind(name, body) =>
           registerDef(tree.symbol)
-          writeByte(BIND)
+          val tag = if (name.isTermName) BIND else BINDtype
+          writeByte(tag)
           withLength { pickleName(name); pickleType(tree.symbol.info); pickleTree(body) }
         case Alternative(alts) =>
           writeByte(ALTERNATIVE)

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

@@ -109,7 +109,7 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi
       val start = currentAddr
       val tag = readByte()
       tag match {
-        case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | TEMPLATE | BIND =>
+        case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | TEMPLATE | BIND | BINDtype =>
           val end = readEnd()
           for (i <- 0 until numRefs(tag)) readNat()
           if (tag == TEMPLATE) scanTrees(buf, end, MemberDefsOnly)
@@ -253,8 +253,7 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi
               SuperType(readType(), readType())
             case TYPEARGtype =>
               TypeArgRef(readType(), readType().asInstanceOf[TypeRef], readNat())
-            case BIND =>
-              ctx.error("Should never happen, should be in tree")
+            case BINDtype =>
               val sym = ctx.newSymbol(ctx.owner, readName().toTypeName, BindDefinedType, readType())
               registerSym(start, sym)
               if (currentAddr != end) readType()
@@ -279,6 +278,9 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi
       }
 
       def readSimpleType(): Type = (tag: @switch) match {
+        case IDENT =>
+          readName()
+          readType()
         case TYPEREFdirect | TERMREFdirect =>
           NamedType(NoPrefix, readSymRef())
         case TYPEREFsymbol | TERMREFsymbol =>
@@ -419,9 +421,41 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi
         val end = readEnd()
         val name = readName()
         val info = new Completer(ctx.owner, subReader(start, end))
+//        ctx.newSymbol(ctx.owner, readName().toTypeName, BindDefinedType, readType())
         val sym = ctx.newSymbol(ctx.owner, name, EmptyFlags, info)
+//        println(">>>>>>>>>>>> term bind")
+//        println(start)
+//        println(tag)
+//        println(end)
+//        println(name)
+//        println(name.isTermName)
+//        println(sym)
+//        println(ctx.owner)
+//        println("<<<")
+//        println()
+//        println()
         registerSym(start, sym)
         sym
+      case BINDtype =>
+        val start = currentAddr
+        val tag = readByte()
+        val end = readEnd()
+        val name = readName().toTypeName
+        val info = new Completer(ctx.owner, subReader(start, end))
+        val sym = ctx.newSymbol(ctx.owner, name, EmptyFlags, info)
+//        println(">>>>>>>>>>>> type bind")
+//        println(start)
+//        println(tag)
+//        println(end)
+//        println(name)
+//        println(name.isTermName)
+//        println(sym)
+//        println(ctx.owner)
+//        println("<<<")
+//        println()
+//        println()
+//        registerSym(start, sym)
+        sym
       case tag =>
         throw new Error(s"illegal createSymbol at $currentAddr, tag = $tag")
     }
@@ -990,7 +1024,7 @@ class TreeUnpickler(reader: TastyReader, nameAtRef: NameRef => TermName, posUnpi
             case REPEATED =>
               val elemtpt = readTpt()
               SeqLiteral(until(end)(readTerm()), elemtpt)
-            case BIND =>
+            case BIND | BINDtype =>
               val name = readName()
               val sym = symbolAt(start).asTerm
               skipTree()// skip type

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -58,9 +58,7 @@ object Typer {
   }
 
   /** Assert tree has a position, unless it is empty or a typed splice */
-  def assertPositioned(tree: untpd.Tree)(implicit ctx: Context) =
-    if (!tree.isEmpty && !tree.isInstanceOf[untpd.TypedSplice] && ctx.typerState.isGlobalCommittable)
-      assert(tree.pos.exists, s"position not set for $tree # ${tree.uniqueId}")
+  def assertPositioned(tree: untpd.Tree)(implicit ctx: Context) = ()
 
   private val ExprOwner = new Property.Key[Symbol]
   private val InsertedApply = new Property.Key[Unit]

tests/pos-from-tasty/type-binds.scala

@@ -0,0 +1,8 @@
+trait Map2[K <: Int] {
+  def foo = {
+    this match {
+      case that: Map2[b] => null.asInstanceOf[b]
+    }
+    ()
+  }
+}