Do not stage bindings for inlined parameters inside quotes

Author: nicolasstucki

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

@@ -322,19 +322,15 @@ class ReifyQuotes extends MacroTransformWithImplicits {
             stats.foreach(markDef)
             mapOverTree(last)
           case Inlined(call, bindings, expansion @ Select(body, name)) if expansion.symbol.isSplice =>
-            if (level == 0) {
-              // To maintain phase consistency, we move the binding of the this parameter into the spliced code
-              val (thisBindings, otherBindings) = bindings.partition {
-                case vdef: ValDef => vdef.symbol.is(Synthetic) // Assume that only _this bindings are tagged with Synthetic
-                case _ => false
-              }
-              val splicedBody = Splicer.splice(seq(thisBindings, body))
-              transform(cpy.Inlined(tree)(call, otherBindings, splicedBody))
-            } else {
-              // To maintain phase consistency, convert inlined expressions of the form
-              // `{ bindings; ~expansion }` to `~{ bindings; expansion }`
-              transform(cpy.Select(expansion)(cpy.Inlined(tree)(call, bindings, body), name))
+            // To maintain phase consistency, we move the binding of the this parameter into the spliced code
+            val (splicedBindings, stagedBindings) = bindings.partition {
+              case vdef: ValDef => vdef.symbol.is(Synthetic) // Assume that only _this bindings are tagged with Synthetic
+              case _ => false
             }
+            val tree1 =
+              if (level == 0) cpy.Inlined(tree)(call, stagedBindings, Splicer.splice(seq(splicedBindings, body)))
+              else seq(stagedBindings, cpy.Select(expansion)(cpy.Inlined(tree)(call, splicedBindings, body), name))
+            transform(tree1)
           case _: Import =>
             tree
           case tree: DefDef if tree.symbol.is(Macro) && level == 0 =>

tests/pos/i3898c/quoted_1.scala

@@ -0,0 +1,5 @@
+import scala.quoted._
+object Macro {
+  inline def ff(x: Int, inline y: Int): String = ~impl('(x))
+  def impl(x: Expr[Int]): Expr[String] = ""
+}

tests/pos/i3898c/quoted_2.scala

@@ -0,0 +1,9 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    val a = '{
+      def z: Int = 5
+      Macro.ff(z, 5)
+    }
+
+  }
+}