Fix bug while unpickling splices in quotes

Author: nicolasstucki

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

@@ -19,6 +19,9 @@ import scala.collection.{ mutable, immutable }
 import config.Printers.pickling
 import typer.Checking
 import config.Config
+import dotty.tools.dotc.quoted.PickledQuotes
+import dotty.tools.dotc.interpreter.RawExpr
+import scala.quoted.Expr
 
 /** Unpickler for typed trees
  *  @param reader          the reader from which to unpickle
@@ -1030,8 +1033,10 @@ class TreeUnpickler(reader: TastyReader,
               val idx = readNat()
               val args = until(end)(readTerm())
               val splice = splices(idx)
-              if (args.isEmpty) splice.asInstanceOf[Tree]
-              else splice.asInstanceOf[Seq[Any] => Tree](args)
+              val expr =
+                if (args.isEmpty) splice.asInstanceOf[Expr[_]]
+                else splice.asInstanceOf[Seq[Any] => Expr[_]](args.map(arg => new RawExpr(arg)))
+              PickledQuotes.quotedToTree(expr)
             case _ =>
               readPathTerm()
           }

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

@@ -34,11 +34,7 @@ object PickledQuotes {
   /** Unpickle the tree contained in the TastyQuoted */
   private def unpickleQuote(expr: quoted.TastyQuoted)(implicit ctx: Context): Tree = {
     val tastyBytes = TastyString.stringToTasty(expr.tasty)
-    val splices = expr.args.map {
-      case arg: quoted.Quoted => quotedToTree(arg)
-      case arg => arg
-    }
-    val unpickled = unpickle(tastyBytes, splices)
+    val unpickled = unpickle(tastyBytes, expr.args)
     unpickled match { // Expects `package _root_ { val ': Any = <tree> }`
       case PackageDef(_, (vdef: ValDef) :: Nil) => vdef.rhs
     }

tests/run/quote-and-splice.check

@@ -4,3 +4,5 @@
 3
 1.0
 5.0
+25.0
+125.0

tests/run/quote-and-splice/Test_2.scala

@@ -8,9 +8,8 @@ object Test {
     println(macro3(1))
     println(power(0, 5))
     println(power(1, 5))
-    // FIXME
-//    println(power(2, 5))
-//    println(power(3, 5))
+    println(power(2, 5))
+    println(power(3, 5))
   }
 
 }