Use Expr and Type to unpickle in CompilerInterface

Author: nicolasstucki

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

@@ -2617,11 +2617,13 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, scala.intern
 
   end reflect
 
-  def unpickleTerm(pickledQuote: PickledQuote): reflect.Term =
-    PickledQuotes.unpickleTerm(pickledQuote)(using reflect.rootContext)
+  def unpickleExpr(pickledQuote: PickledQuote): scala.quoted.Expr[Any] =
+    val tree = PickledQuotes.unpickleTerm(pickledQuote)(using reflect.rootContext)
+    new scala.internal.quoted.Expr(tree, hash)
 
-  def unpickleTypeTree(pickledQuote: PickledQuote): reflect.TypeTree =
-    PickledQuotes.unpickleTypeTree(pickledQuote)(using reflect.rootContext)
+  def unpickleType(pickledQuote: PickledQuote): scala.quoted.Type[?] =
+    val tree = PickledQuotes.unpickleTypeTree(pickledQuote)(using reflect.rootContext)
+    new scala.internal.quoted.Type(tree, hash)
 
   def termMatch(scrutinee: reflect.Term, pattern: reflect.Term): Option[Tuple] =
     treeMatch(scrutinee, pattern)

library/src/scala/internal/quoted/CompilerInterface.scala

@@ -12,12 +12,12 @@ trait CompilerInterface { self: scala.quoted.QuoteContext =>
   /** Unpickle `repr` which represents a pickled `Expr` tree,
    *  replacing splice nodes with `holes`
    */
-  def unpickleTerm(pickledQuote: PickledQuote): Term
+  def unpickleExpr(pickledQuote: PickledQuote): scala.quoted.Expr[Any]
 
   /** Unpickle `repr` which represents a pickled `Type` tree,
    *  replacing splice nodes with `holes`
    */
-  def unpickleTypeTree(pickledQuote: PickledQuote): TypeTree
+  def unpickleType(pickledQuote: PickledQuote): scala.quoted.Type[?]
 
   /** Pattern matches the scrutinee against the pattern and returns a tuple
    *  with the matched holes if successful.

library/src/scala/internal/quoted/PickledQuote.scala

@@ -18,13 +18,11 @@ object PickledQuote:
 
   def unpickleExpr[T](pickledQuote: PickledQuote): QuoteContext ?=> Expr[T] =
     val qctx = CompilerInterface.quoteContextWithCompilerInterface(summon[QuoteContext])
-    val tree = qctx.unpickleTerm(pickledQuote)
-    new scala.internal.quoted.Expr(tree, qctx.hashCode).asInstanceOf[Expr[T]]
+    qctx.unpickleExpr(pickledQuote).asInstanceOf[Expr[T]]
 
   def unpickleType[T](pickledQuote: PickledQuote): QuoteContext ?=> Type[T] =
     val qctx = CompilerInterface.quoteContextWithCompilerInterface(summon[QuoteContext])
-    val tree = qctx.unpickleTypeTree(pickledQuote)
-    new scala.internal.quoted.Type(tree, qctx.hashCode).asInstanceOf[Type[T]]
+    qctx.unpickleType(pickledQuote).asInstanceOf[Type[T]]
 
   /** Create an instance of PickledExpr from encoded tasty and sequence of labmdas to fill holes
    *