Fix quoted match inline bindings leak

Author: nicolasstucki

library/src-non-bootstrapped/dotty/internal/StringContextMacro.scala

@@ -7,7 +7,7 @@ import scala.quoted._
 object StringContextMacro {
 
   /** Implementation of scala.StringContext.f used in Dotty */
-  inline def f(sc: => StringContext)(args: Any*): String =
+  inline def f(inline sc: StringContext)(args: Any*): String =
     scala.compiletime.error("Cannot expand f interpolator while bootstrapping the compiler")
 
 }

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

@@ -33,7 +33,7 @@ private[quoted] object Matcher {
       if (hasTypeSplices) {
         val ctx: Context = internal.Context_GADT_setFreshGADTBounds(rootContext)
         given Context = ctx
-        val matchings = scrutineeTerm.underlyingArgument =?= patternTerm.underlyingArgument
+        val matchings = scrutineeTerm =?= patternTerm
         // After matching and doing all subtype checks, we have to approximate all the type bindings
         // that we have found and seal them in a quoted.Type
         matchings.asOptionOfTuple.map { tup =>
@@ -44,7 +44,7 @@ private[quoted] object Matcher {
         }
       }
       else {
-        scrutineeTerm.underlyingArgument =?= patternTerm.underlyingArgument
+        scrutineeTerm =?= patternTerm
       }
     }
 

tests/neg-macros/i6432/Macro_1.scala

@@ -4,7 +4,7 @@ import scala.quoted.autolift.{given _}
 
 
 object Macro {
-  inline def (sc: => StringContext).foo(args: String*): Unit = ${ impl('sc) }
+  inline def (inline sc: StringContext).foo(args: String*): Unit = ${ impl('sc) }
 
   def impl(sc: Expr[StringContext])(using qctx: QuoteContext) : Expr[Unit] = {
     import qctx.tasty._

tests/neg-macros/i6432b/Macro_1.scala

@@ -4,7 +4,7 @@ import scala.quoted.autolift.{given _}
 
 
 object Macro {
-  inline def (sc: => StringContext).foo(args: String*): Unit = ${ impl('sc) }
+  inline def (inline sc: StringContext).foo(args: String*): Unit = ${ impl('sc) }
 
   def impl(sc: Expr[StringContext])(using qctx: QuoteContext) : Expr[Unit] = {
     import qctx.tasty._

tests/neg/i7698.scala

@@ -11,4 +11,4 @@ def showInterpolatorImpl(sc: Expr[StringContext], argsExpr: Expr[Seq[Any]])(usin
     case '[ Int ] => // error
   ???
 
-inline def (sc: => StringContext) show (args: Any*): String = ${ showInterpolatorImpl('sc, 'args) }
+inline def (inline sc: StringContext) show (args: Any*): String = ${ showInterpolatorImpl('sc, 'args) }

tests/run-macros/i5119/Macro_1.scala

@@ -5,7 +5,7 @@ object Macro {
   class StringContextOps(sc: => StringContext) {
     inline def ff(args: => Any*): String = ${ Macro.impl('sc, 'args) }
   }
-  implicit inline def XmlQuote(sc: => StringContext): StringContextOps = new StringContextOps(sc)
+  implicit inline def XmlQuote(inline sc: StringContext): StringContextOps = new StringContextOps(sc)
   def impl(sc: Expr[StringContext], args: Expr[Seq[Any]])(using qctx: QuoteContext) : Expr[String] = {
     import qctx.tasty._
     (sc.unseal.underlyingArgument.showExtractors + "\n" + args.unseal.underlyingArgument.showExtractors)

tests/run-macros/quote-elide-prefix/quoted_1.scala

@@ -3,7 +3,7 @@ import scala.quoted._
 object Macro {
 
   // By name StringContext is used to elide the prefix
-  inline def (sc: => StringContext) ff (args: => Any*): String = ${ Macro.impl('sc, 'args) }
+  inline def (inline sc: StringContext) ff (args: => Any*): String = ${ Macro.impl('sc, 'args) }
 
   def impl(sc: Expr[StringContext], args: Expr[Seq[Any]])(using QuoteContext): Expr[String] = '{ $args.mkString }
 }

tests/run-macros/quote-matcher-runtime/quoted_1.scala

@@ -5,7 +5,7 @@ object Macros {
   inline def matches[A, B](inline a: A, inline b: B): Unit = ${impl('a, 'b)}
 
   private def impl[A, B](a: Expr[A], b: Expr[B])(using qctx: QuoteContext) : Expr[Unit] = {
-    import qctx.tasty.{Bind => _, given _, _}
+    import qctx.tasty._
 
     val res = scala.internal.quoted.Expr.unapply[Tuple, Tuple](a)(using b, true, qctx).map { tup =>
       tup.toArray.toList.map {

tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala

@@ -4,7 +4,7 @@ import scala.quoted._
 
 object Macros {
 
-  inline def (self: => StringContext) xyz(inline args: String*): String = ${impl('self, 'args)}
+  inline def (inline self: StringContext) xyz(inline args: String*): String = ${impl('self, 'args)}
 
   private def impl(self: Expr[StringContext], args: Expr[Seq[String]])(using QuoteContext): Expr[String] = {
     (self, args) match {

tests/run-macros/quote-matcher-string-interpolator-3/quoted_1.scala

@@ -4,7 +4,7 @@ import scala.quoted._
 
 object Macros {
 
-  inline def (self: => StringContext) S(args: => String*): String = ${impl('self, 'args)}
+  inline def (inline self: StringContext) S(args: => String*): String = ${impl('self, 'args)}
 
   private def impl(self: Expr[StringContext], args: Expr[Seq[String]])(using QuoteContext): Expr[String] = {
     self match {

tests/run-macros/quote-matcher-symantics-1/quoted_1.scala

@@ -4,7 +4,7 @@ import scala.quoted._
 
 object Macros {
 
-  inline def lift[T](sym: Symantics[T])(a: => DSL): T = ${impl[T]('sym, 'a)}
+  inline def lift[T](sym: Symantics[T])(inline a: DSL): T = ${impl[T]('sym, 'a)}
 
   private def impl[T: Type](sym: Expr[Symantics[T]], a: Expr[DSL])(using qctx: QuoteContext): Expr[T] = {
 

tests/run-macros/quote-matching-open/Macro_1.scala

@@ -2,7 +2,7 @@ import scala.quoted._
 import scala.quoted.unsafe._
 object Macro {
 
-  inline def openTest(x: => Any): Any = ${ Macro.impl('x) }
+  inline def openTest(inline x: Any): Any = ${ Macro.impl('x) }
 
   def impl(x: Expr[Any])(using QuoteContext): Expr[Any] = {
     x match {

tests/run-macros/quoted-pattern-open-expr/Macro_1.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 
-inline def test(e: Int): String = ${testExpr('e)}
+inline def test(inline e: Int): String = ${testExpr('e)}
 
 private def testExpr(e: Expr[Int])(using QuoteContext): Expr[String] = {
   e match {