Set needsStaging when quotes or splices are created

Author: nicolasstucki

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

@@ -217,10 +217,8 @@ object Applications {
   class ExtMethodApply(app: Tree)(implicit @constructorOnly src: SourceFile)
   extends IntegratedTypeArgs(app)
 
-  /** 1. If we are in an inline method but not in a nested quote, mark the inline method
+  /** If we are in an inline method but not in a nested quote, mark the inline method
    *  as a macro.
-   *
-   *  2. If selection is a quote or splice node, record that fact in the current compilation unit.
    */
   def handleMeta(tree: Tree)(implicit ctx: Context): tree.type = {
     import transform.SymUtils._
@@ -229,15 +227,8 @@ object Applications {
       if (c.owner eq c.outer.owner) markAsMacro(c.outer)
       else if (c.owner.isInlineMethod) c.owner.setFlag(Macro)
       else if (!c.outer.owner.is(Package)) markAsMacro(c.outer)
-    val sym = tree.symbol
-    if (sym.isSplice) {
-      if (StagingContext.level == 0)
-        markAsMacro(ctx)
-      ctx.compilationUnit.needsStaging = true
-    } else if (sym.isQuote) {
-      ctx.compilationUnit.needsStaging = true
-    }
-
+    if (tree.symbol.isSplice && StagingContext.level == 0)
+      markAsMacro(ctx)
     tree
   }
 }

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

@@ -1936,8 +1936,10 @@ class Typer extends Namer
         ctx.warning("Canceled splice directly inside a quote. '{ ${ XYZ } } is equivalent to XYZ.", tree.sourcePos)
         typed(innerExpr, pt)
       case quoted if quoted.isType =>
+        ctx.compilationUnit.needsStaging = true
         typedTypeApply(untpd.TypeApply(untpd.ref(defn.InternalQuoted_typeQuoteR), quoted :: Nil), pt)(quoteContext).withSpan(tree.span)
       case quoted =>
+        ctx.compilationUnit.needsStaging = true
         if (ctx.mode.is(Mode.Pattern) && level == 0) {
           val exprPt = pt.baseType(defn.QuotedExprClass)
           val quotedPt = if (exprPt.exists) exprPt.argTypesHi.head else defn.AnyType
@@ -2012,6 +2014,7 @@ class Typer extends Namer
         ctx.warning("Canceled quote directly inside a splice. ${ '{ XYZ } } is equivalent to XYZ.", tree.sourcePos)
         typed(innerExpr, pt)
       case expr =>
+        ctx.compilationUnit.needsStaging = true
         if (ctx.mode.is(Mode.QuotedPattern) && level == 1) {
           if (isFullyDefined(pt, ForceDegree.all)) {
             def spliceOwner(ctx: Context): Symbol =
@@ -2031,6 +2034,7 @@ class Typer extends Namer
 
   /** Translate ${ t: Type[T] }` into type `t.splice` while tracking the quotation level in the context */
   def typedTypSplice(tree: untpd.TypSplice, pt: Type)(implicit ctx: Context): Tree = track("typedTypSplice") {
+    ctx.compilationUnit.needsStaging = true
     checkSpliceOutsideQuote(tree)
     typedSelect(untpd.Select(tree.expr, tpnme.splice), pt)(spliceContext).withSpan(tree.span)
   }

tests/run-with-compiler/i6263.scala

@@ -0,0 +1,14 @@
+import quoted._
+object Test {
+
+  def main(args: Array[String]): Unit = {
+    fn("foo")
+    fn((1,2))
+    fn(O)
+    fn(1)
+  }
+
+  def fn[T : Type](v : T) = "ok"
+}
+
+object O