Move Staging before Pickler

Author: nicolasstucki

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -45,8 +45,8 @@ class Compiler {
 
   /** Phases dealing with TASTY tree pickling and unpickling */
   protected def picklerPhases: List[List[Phase]] =
-    List(new Pickler) ::            // Generate TASTY info
     List(new Staging) ::            // Check quotation levels (while healing types) and expand macros
+    List(new Pickler) ::            // Generate TASTY info
     List(new ReifyQuotes) ::        // Turn quoted trees into explicit run-time data structures
     Nil
 

compiler/src/dotty/tools/dotc/tastyreflect/TreeOpsImpl.scala

@@ -775,7 +775,7 @@ trait TreeOpsImpl extends scala.tasty.reflect.TreeOps with CoreImpl with Helpers
         tpd.Return(expr, ctx.owner)
 
       def copy(original: Tree)(expr: Term)(implicit ctx: Context): Return =
-        tpd.cpy.Return(original)(expr, tpd.EmptyTree)
+        tpd.cpy.Return(original)(expr, tpd.ref(ctx.owner))
 
       def unapply(x: Term)(implicit ctx: Context): Option[Term] = x match {
         case x: tpd.Return => Some(x.expr)

compiler/src/dotty/tools/dotc/transform/Staging.scala

@@ -83,7 +83,7 @@ class Staging extends MacroTransformWithImplicits {
       * These will be turned into splices using `addTags` and represent types spliced
       * explicitly.
       */
-    val explicitTags = new mutable.LinkedHashSet[TypeRef]()
+    val explicitTags = new mutable.LinkedHashSet[(TypeRef, Position)]()
 
     /** A stack of entered symbols, to be unwound after scope exit */
     var enteredSyms: List[Symbol] = Nil
@@ -111,7 +111,8 @@ class Staging extends MacroTransformWithImplicits {
           name = UniqueName.fresh("T".toTermName).toTypeName,
           flags = Synthetic,
           info = TypeAlias(tag.tpe.select(tpnme.UNARY_~)),
-          coord = typeRef.prefix.termSymbol.coord).asType
+          coord = alias.pos
+        ).asType
 
         ctx.typeAssigner.assignType(untpd.TypeDef(local.name, alias), local)
       }
@@ -126,11 +127,11 @@ class Staging extends MacroTransformWithImplicits {
         importedTags.clear()
 
         // The tree of the tag for each tag comes from a type ref e.g., ~t
-        val explicitTypeDefs = for (tref <- explicitTags) yield {
-          val tag = ref(tref.prefix.termSymbol)
+        val explicitTypeDefs = for ((tref, pos) <- explicitTags) yield {
+          val tag = ref(tref.prefix.termSymbol).withPos(pos)
           mkTagSymbolAndAssignType(tref, tag)
         }
-        val tagsExplicitTypeDefsPairs = explicitTags.zip(explicitTypeDefs)
+        val tagsExplicitTypeDefsPairs = explicitTags.map(_._1).zip(explicitTypeDefs)
         explicitTags.clear()
 
         // Maps type splices to type references of tags e.g., ~t -> some type T$1
@@ -243,7 +244,7 @@ class Staging extends MacroTransformWithImplicits {
         tp match {
           case tp: TypeRef if tp.symbol.isSplice =>
             if (inQuote) {
-              explicitTags += tp
+              explicitTags += Tuple2(tp, pos)
               outer.checkType(pos).foldOver(acc, tp)
             }
             else {
@@ -396,7 +397,7 @@ class Staging extends MacroTransformWithImplicits {
             tree.rhs match {
               case InlineSplice(_) =>
                 mapOverTree(enteredSyms) // Ignore output, only check PCP
-                cpy.DefDef(tree)(rhs = defaultValue(tree.rhs.tpe))
+                tree
               case _ =>
                 ctx.error(
                   """Malformed macro.

library/src/scala/tasty/reflect/TreeOps.scala

@@ -637,7 +637,7 @@ trait TreeOps extends Core {
 
     /** Scala local `return` */
     val Return: ReturnModule
-    abstract class ReturnModule {
+    abstract class ReturnModule { // TODO should we expose explicitly the returns `from`?
 
       /** Creates `return <expr: Term>` */
       def apply(expr: Term)(implicit ctx: Context): Return

tests/plugins/neg/divideZero/plugin_1.scala

@@ -8,7 +8,7 @@ import transform.MegaPhase.MiniPhase
 import Decorators._
 import Symbols.Symbol
 import Constants.Constant
-import transform.{Pickler, Staging}
+import transform.{Pickler, ReifyQuotes}
 import StdNames._
 
 class DivideZero extends PluginPhase with StandardPlugin {
@@ -18,7 +18,7 @@ class DivideZero extends PluginPhase with StandardPlugin {
   val phaseName = name
 
   override val runsAfter = Set(Pickler.name)
-  override val runsBefore = Set(Staging.name)
+  override val runsBefore = Set(ReifyQuotes.name)
 
   override def init(options: List[String]): List[PluginPhase] = this :: Nil