wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala

@@ -98,6 +98,12 @@ object PickledQuotes {
 
   /** Pickle tree into it's TASTY bytes s*/
   private def pickle(tree: Tree)(implicit ctx: Context): Array[Byte] = {
+    // println("+++++++++++++++++++++++++++++++")
+    // println(tree.show)
+    // println(tree)
+    // println()
+    // println()
+    // println()
     val pickler = new TastyPickler(defn.RootClass)
     val treePkl = pickler.treePkl
     treePkl.pickle(tree :: Nil)

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

@@ -599,9 +599,19 @@ class TreePickler(pickler: TastyPickler) {
               pickleTree(alias)
           }
         case Hole(_, idx, args) =>
+          lazy val erasedSplicesType = new TypeMap() {
+            override def apply(tp: Type): Type = tp match {
+              case tp: TypeRef if tp.typeSymbol.isSplice || tp.typeSymbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) => tp.dealias.typeSymbol.info.hiBound
+              case tp =>
+                mapOver(tp)
+            }
+          }
+          val tpe = erasedSplicesType(tree.tpe)
+
           writeByte(HOLE)
           withLength {
             writeNat(idx)
+            pickleType(tpe)
             args.foreach(pickleTree)
           }
       }

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

@@ -1292,8 +1292,14 @@ class TreeUnpickler(reader: TastyReader,
 
     def readHole(end: Addr, isType: Boolean)(implicit ctx: Context): Tree = {
       val idx = readNat()
+      val tpe = readType() // FIXME use to set type to the unpickled tree
       val args = until(end)(readTerm())
       val splice = splices(idx)
+      // println("++++++++++++++++++++++++++++++=")
+      // println(tpe.show)
+      // println(isType)
+      // println()
+      // println()
       def wrap(arg: Tree) =
         if (arg.isTerm) (qctx: scala.quoted.QuoteContext) ?=> new TastyTreeExpr(arg, QuoteContext.scopeId)
         else new TreeType(arg, QuoteContext.scopeId)
@@ -1305,7 +1311,8 @@ class TreeUnpickler(reader: TastyReader,
       else {
         val splice1 = splice.asInstanceOf[Seq[Any] => scala.quoted.QuoteContext ?=> quoted.Expr[?]]
         val quotedExpr = splice1(reifiedArgs)(using dotty.tools.dotc.quoted.QuoteContext())
-        PickledQuotes.quotedExprToTree(quotedExpr)
+        val a = PickledQuotes.quotedExprToTree(quotedExpr)
+        a.ensureConforms(tpe).withSpan(a.span)
       }
       // We need to make sure a hole is created with the source file of the surrounding context, even if
       // it filled with contents a different source file. Otherwise nodes containing holes might end

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

@@ -254,7 +254,7 @@ Standard Section: "Comments" Comment*
 object TastyFormat {
 
   final val header: Array[Int] = Array(0x5C, 0xA1, 0xAB, 0x1F)
-  val MajorVersion: Int = 20
+  val MajorVersion: Int = 21
   val MinorVersion: Int = 0
 
   /** Tags used to serialize names, should update [[nameTagToString]] if a new constant is added */

tests/pos-macros/i7110/Macro_1.scala

@@ -2,7 +2,7 @@ import scala.quoted._
 
 object Macros {
 
-  inline def m[R](sym: Symantics[R]) : R = ${  mImpl[R]('{sym}) }
+  // inline def m[R](sym: Symantics[R]) : R = ${  mImpl[R]('{sym}) }
 
   def mImpl[R: Type](using qctx: QuoteContext)(sym: Expr[Symantics[R]]): Expr[R] =  '{
     $sym.Meth(42)