wip

Author: nicolasstucki

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

@@ -35,11 +35,20 @@ object PickledQuotes {
   def quotedExprToTree[T](expr: quoted.Expr[T])(implicit ctx: Context): Tree = expr match {
     case expr: TastyExpr[_] =>
       val unpickled = unpickleExpr(expr)
-      val force = new TreeTraverser {
-        def traverse(tree: tpd.Tree)(implicit ctx: Context): Unit = traverseChildren(tree)
+      val forceAndCleanArtifacts = new TreeMap {
+        override def transform(tree: tpd.Tree)(implicit ctx: Context): tpd.Tree = tree match {
+          case tree: TypeDef if tree.symbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) => Thicket()
+          case tree =>
+            val dealiasTypeTags = new TypeMap() {
+              override def apply(tp: Type): Type = mapOver(tp match {
+                case tp: TypeRef if tp.typeSymbol.hasAnnotation(defn.InternalQuoted_QuoteTypeTagAnnot) => tp.dealias
+                case _ => tp
+              })
+            }
+            super.transform(tree).withType(dealiasTypeTags(tree.tpe))
+        }
       }
-      force.traverse(unpickled)
-      unpickled
+      forceAndCleanArtifacts.transform(unpickled)
     case expr: LiftedExpr[T] =>
       expr.value match {
         case value: Class[_] => ref(defn.Predef_classOf).appliedToType(classToType(value))

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

@@ -2071,7 +2071,7 @@ class Typer extends Namer
           Literal(Constant(typeBindings.nonEmpty)) ::
           implicitArgTree(defn.QuoteContextType, quoteSpan) :: Nil,
       patterns = splicePat :: Nil,
-      proto = defn.QuotedExprType.appliedTo(quoted1.tpe & quotedPt))
+      proto = defn.QuotedExprType.appliedTo(replaceBindings(quoted1.tpe) & quotedPt))
   }
 
   /** Split a typed quoted pattern is split into its type bindings, pattern expression and inner patterns.

library/src-bootstrapped/scala/internal/quoted/Matcher.scala

@@ -80,15 +80,6 @@ object Matcher {
       def normalize(tree: Tree): Tree = tree match {
         case Block(Nil, expr) => normalize(expr)
         case Block(stats1, Block(stats2, expr)) => normalize(Block(stats1 ::: stats2, expr))
-//        case Block(stats, expr) =>
-//          val stats1 = stats.filter { // TODO filterConserve
-//            case IsTypeDef(s) =>
-//              !s.symbol.annots.exists(_.symbol.owner == kernel.Definitions_InternalQuoted_quoteTypeTagAnnot) &&
-//              !hasBindAnnotation(s.symbol)
-//            case _ => true
-//          }
-//          if (stats1.isEmpty) normalize(expr)
-//          else Block.copy(tree)(stats1, expr)
         case Inlined(_, Nil, expr) => normalize(expr)
         case _ => tree
       }

tests/run-macros/quote-matching-optimize-1.check

@@ -7,7 +7,7 @@ Optimized: ls2.filter(((x: scala.Char) => x.<('c').&&(x.>('a'))))
 Result: List(b)
 
 Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1))).filter(((x: scala.Int) => x.==(2)))
-Optimized: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1).&&(x.==(2))))
+Optimized: ls.filter(((x: scala.Int) => x.<(3).&&(x.>(1).&&(x.==(2)))))
 Result: List(2)
 
 1

tests/run-macros/quote-matching-optimize-2.check

@@ -7,7 +7,7 @@ Optimized: ls2.filter(((x: scala.Char) => x.<('c').&&(x.>('a'))))
 Result: List(b)
 
 Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1))).filter(((x: scala.Int) => x.==(2)))
-Optimized: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1).&&(x.==(2))))
+Optimized: ls.filter(((x: scala.Int) => x.<(3).&&(x.>(1).&&(x.==(2)))))
 Result: List(2)
 
 1

tests/run-macros/quote-matching-optimize-3.check

@@ -7,7 +7,7 @@ Optimized: ls2.filter(((x: scala.Char) => ((x: scala.Char) => x.<('c')).apply(x)
 Result: List(b)
 
 Original: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => x.>(1))).filter(((x: scala.Int) => x.==(2)))
-Optimized: ls.filter(((x: scala.Int) => x.<(3))).filter(((x: scala.Int) => ((x: scala.Int) => x.>(1)).apply(x).&&(((x: scala.Int) => x.==(2)).apply(x))))
+Optimized: ls.filter(((x: scala.Int) => ((x: scala.Int) => x.<(3)).apply(x).&&(((x: scala.Int) => ((x: scala.Int) => x.>(1)).apply(x).&&(((x: scala.Int) => x.==(2)).apply(x))).apply(x))))
 Result: List(2)
 
 1