Fixes to inlining untyped trees

Author: odersky

compiler/src/dotty/tools/dotc/ast/TreeTypeMap.scala

@@ -126,7 +126,7 @@ class TreeTypeMap(
   override def transformStats(trees: List[tpd.Tree])(implicit ctx: Context) =
     transformDefs(trees)._2
 
-  private def transformDefs[TT <: tpd.Tree](trees: List[TT])(implicit ctx: Context): (TreeTypeMap, List[TT]) = {
+  def transformDefs[TT <: tpd.Tree](trees: List[TT])(implicit ctx: Context): (TreeTypeMap, List[TT]) = {
     val tmap = withMappedSyms(tpd.localSyms(trees))
     (tmap, tmap.transformSub(trees))
   }

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

@@ -575,6 +575,9 @@ object Flags {
   /** An accessor or label */
   final val AccessorOrLabel = Accessor | Label
 
+  /** An accessor or a synthetic symbol */
+  final val AccessorOrSynthetic = Accessor | Synthetic
+
   /** A synthetic or private definition */
   final val SyntheticOrPrivate = Synthetic | Private
 

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

@@ -783,7 +783,7 @@ object SymDenotations {
 
     def isSkolem: Boolean = name == nme.SKOLEM
 
-    def isInlineMethod(implicit ctx: Context): Boolean = is(InlineMethod, butNot = Accessor)
+    def isInlineMethod(implicit ctx: Context): Boolean = is(InlineMethod, butNot = AccessorOrSynthetic)
 
     /** ()T and => T types should be treated as equivalent for this symbol.
      *  Note: For the moment, we treat Scala-2 compiled symbols as loose matching,

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

@@ -1825,7 +1825,7 @@ object Types {
 
     private def setDenot(denot: Denotation)(implicit ctx: Context): Unit = {
       if (ctx.isAfterTyper)
-        assert(!denot.isOverloaded, this)
+        assert(!denot.isOverloaded || ctx.mode.is(Mode.Printing), this)
       if (Config.checkNoDoubleBindings)
         if (ctx.settings.YnoDoubleBindings.value)
           checkSymAssign(denot.symbol)

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

@@ -309,6 +309,7 @@ object TastyFormat {
   final val MACRO = 33
   final val ERASED = 34
   final val PARAMsetter = 35
+  final val EMPTYTREE = 36
 
   // Cat. 2:    tag Nat
 
@@ -444,7 +445,7 @@ object TastyFormat {
 
   /** Useful for debugging */
   def isLegalTag(tag: Int) =
-    firstSimpleTreeTag <= tag && tag <= PARAMsetter ||
+    firstSimpleTreeTag <= tag && tag <= EMPTYTREE ||
     firstNatTreeTag <= tag && tag <= SYMBOLconst ||
     firstASTTreeTag <= tag && tag <= SINGLETONtpt ||
     firstNatASTTreeTag <= tag && tag <= NAMEDARG ||
@@ -539,6 +540,7 @@ object TastyFormat {
     case DEFAULTparameterized => "DEFAULTparameterized"
     case STABLE => "STABLE"
     case PARAMsetter => "PARAMsetter"
+    case EMPTYTREE => "EMPTYTREE"
 
     case SHAREDterm => "SHAREDterm"
     case SHAREDtype => "SHAREDtype"

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

@@ -857,7 +857,8 @@ class TreePickler(pickler: TastyPickler) {
         writeByte(TYPEDSPLICE)
         withLength { pickleTree(splice) }
       case Thicket(trees) =>
-        trees.foreach(pickleUntyped)
+        if (trees.isEmpty) writeByte(EMPTYTREE)
+        else trees.foreach(pickleUntyped)
       case _ =>
         pickleUntyped(desugar(tree))
     }

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

@@ -627,9 +627,12 @@ class TreeUnpickler(reader: TastyReader,
         val end = readEnd()
         val tp = readType()
         val lazyAnnotTree = readLater(end, rdr => ctx => rdr.readTerm()(ctx))
-        Annotation.deferredSymAndTree(
-          implicit ctx => tp.typeSymbol,
-          implicit ctx => lazyAnnotTree.complete)
+        if (tp.isRef(defn.BodyAnnot))
+          LazyBodyAnnotation(implicit ctx => lazyAnnotTree.complete)
+        else
+          Annotation.deferredSymAndTree(
+            implicit ctx => tp.typeSymbol,
+            implicit ctx => lazyAnnotTree.complete)
     }
 
     /** Create symbols for the definitions in the statement sequence between
@@ -1239,8 +1242,11 @@ class TreeUnpickler(reader: TastyReader,
           untpd.ByNameTypeTree(readUntyped())
         case NAMEDARG =>
           untpd.NamedArg(readName(), readUntyped())
+        case EMPTYTREE =>
+          untpd.EmptyTree
         case SHAREDtype =>
-          assert(readNat() == 0)
+          val b = readNat()
+          assert(b == 0, i"bad shared type $b at $currentAddr when reading ${ctx.owner.ownersIterator.toList}%, %")
           untpd.TypeTree()
         case _ =>
           untpd.Literal(readConstant(tag))
@@ -1275,7 +1281,7 @@ class TreeUnpickler(reader: TastyReader,
           case ASSIGN =>
             untpd.Assign(readUntyped(), readUntyped())
           case BLOCK =>
-            val expr = ifBefore(end)(readUntyped(), untpd.EmptyTree)
+            val expr = readUntyped()
             val stats = until(end)(readUntyped())
             untpd.Block(stats, expr)
           case IF =>
@@ -1346,7 +1352,11 @@ class TreeUnpickler(reader: TastyReader,
             untpd.TypedSplice(readTerm())
           case FUNCTION =>
             val body = readUntyped()
-            val params = until(end)(readUntyped())
+            import untpd.modsDeco
+            val params = until(end)(readUntyped()).map {
+              case param: untpd.ValDef => param.withMods(param.mods | Param)
+              case param => param
+            }
             untpd.Function(params, body)
           case INFIXOP =>
             untpd.InfixOp(readUntyped(), readIdent(), readUntyped())

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -169,8 +169,6 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
     }
 
     homogenize(tp) match {
-      case x: ConstantType if homogenizedView =>
-        return toText(x.widen)
       case AppliedType(tycon, args) =>
         val cls = tycon.typeSymbol
         if (tycon.isRepeatedParam) return toTextLocal(args.head) ~ "*"
@@ -617,7 +615,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
   }
 
   private def toTextOwner(tree: Tree[_]) =
-    "[owner = " ~ tree.symbol.owner.show ~ "]" provided ctx.settings.YprintDebugOwners.value
+    "[owner = " ~ tree.symbol.maybeOwner.show ~ "]" provided ctx.settings.YprintDebugOwners.value
 
   protected def dclTextOr[T >: Untyped](tree: Tree[T])(treeText: => Text) =
     toTextOwner(tree) ~ {

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

@@ -597,7 +597,8 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
       // tree of the method as part of the signature we send to sbt.
       // To do this properly we would need a way to hash trees and types in
       // dotty itself.
-      annots += marker(Inliner.bodyToInline(s).show)
+      val printTypesCtx = ctx.fresh.setSetting(ctx.settings.XprintTypes, true)
+      annots += marker(Inliner.bodyToInline(s).show(printTypesCtx))
     }
 
     // In the Scala2 ExtractAPI phase we only extract annotations that extend