Merge pull request #8642 from dotty-staging/fix-#7343

Fix #7343: Detect inlined quotes

Author: nicolasstucki

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

@@ -282,14 +282,7 @@ class ReifyQuotes extends MacroTransform {
 
       val tpe = MethodType(defn.SeqType.appliedTo(defn.AnyType) :: Nil, tree.tpe.widen)
       val meth = ctx.newSymbol(lambdaOwner, UniqueName.fresh(nme.ANON_FUN), Synthetic | Method, tpe)
-      val closure = Closure(meth, tss => body(tss.head.head)(ctx.withOwner(meth)).changeOwner(ctx.owner, meth)).withSpan(tree.span)
-
-      enclosingInlineds match {
-        case enclosingInline :: _ =>
-         // In case a tree was inlined inside of the quote and we this closure corresponds to code within it we need to keep the inlined node.
-         Inlined(enclosingInline, Nil, closure)(ctx.withSource(lambdaOwner.topLevelClass.source))
-        case Nil => closure
-      }
+      Closure(meth, tss => body(tss.head.head)(ctx.withOwner(meth)).changeOwner(ctx.owner, meth)).withSpan(tree.span)
     }
 
     private def transformWithCapturer(tree: Tree)(capturer: mutable.Map[Symbol, Tree] => Tree => Tree)(implicit ctx: Context): Tree = {

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

@@ -1138,16 +1138,22 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     }
 
     override def typedIdent(tree: untpd.Ident, pt: Type)(using Context): Tree =
-      tryInline(tree.asInstanceOf[tpd.Tree]) `orElse` super.typedIdent(tree, pt)
+      checkStaging(tryInline(tree.asInstanceOf[tpd.Tree]) `orElse` super.typedIdent(tree, pt))
 
     override def typedSelect(tree: untpd.Select, pt: Type)(using Context): Tree = {
       assert(tree.hasType, tree)
       val qual1 = typed(tree.qualifier, selectionProto(tree.name, pt, this))
       val res = constToLiteral(untpd.cpy.Select(tree)(qual1, tree.name).withType(tree.typeOpt))
       ensureAccessible(res.tpe, tree.qualifier.isInstanceOf[untpd.Super], tree.sourcePos)
-      res
+      checkStaging(res)
     }
 
+    private def checkStaging(tree: Tree): tree.type =
+      val sym = tree.symbol
+      if sym == defn.InternalQuoted_exprQuote || sym == defn.InternalQuoted_typeQuote then
+        ctx.compilationUnit.needsStaging = true
+      tree
+
     override def typedIf(tree: untpd.If, pt: Type)(using Context): Tree =
       typed(tree.cond, defn.BooleanType) match {
         case cond1 @ ConstantValue(b: Boolean) =>

tests/pos-macros/i3898c/quoted_1.scala renamed to tests/disabled/pos-macros/i3898c/quoted_1.scala

@@ -0,0 +1,7 @@
+import scala.quoted.{ QuoteContext, Expr, Type }
+
+trait M[T] {
+  def f: Any
+}
+
+inline def g[T: Type](em: Expr[M[T]])(using QuoteContext) = '{$em.f}

tests/pos-macros/i3898c/quoted_2.scala renamed to tests/disabled/pos-macros/i3898c/quoted_2.scala

@@ -0,0 +1,3 @@
+import scala.quoted.{ QuoteContext, Expr }
+
+def h(m: Expr[M[String]])(using QuoteContext): Expr[Any] = g(m)

tests/pos-macros/i7322/Macro_1.scala

@@ -0,0 +1,7 @@
+import scala.quoted.{ QuoteContext, Expr }
+
+trait M {
+  def f: Any
+}
+
+inline def g(em: Expr[M])(using QuoteContext) = '{$em.f}

tests/pos-macros/i7322/Test_2.scala

@@ -0,0 +1,3 @@
+import scala.quoted.{ QuoteContext, Expr }
+
+def h(m: Expr[M])(using QuoteContext): Expr[Any] = g(m)

tests/pos-macros/i7343/Macro_1.scala

@@ -0,0 +1 @@
+inline def g(using scala.quoted.QuoteContext) = '{1}

tests/pos-macros/i7343/Test_2.scala

@@ -0,0 +1 @@
+def h(using scala.quoted.QuoteContext) = g