Use defn directly

Author: nicolasstucki

compiler/src/scala/quoted/runtime/impl/Matcher.scala

@@ -4,6 +4,9 @@ package runtime.impl
 import scala.annotation.internal.sharable
 import scala.annotation.{Annotation, compileTimeOnly}
 
+import dotty.tools.dotc
+import dotty.tools.dotc.core.Contexts._
+
 /** Matches a quoted tree against a quoted pattern tree.
  *  A quoted pattern tree may have type and term holes in addition to normal terms.
  *
@@ -96,7 +99,7 @@ import scala.annotation.{Annotation, compileTimeOnly}
  */
 object Matcher {
 
-  abstract class QuoteMatcher[QCtx <: Quotes & Singleton](val qctx: QCtx) {
+  class QuoteMatcher[QCtx <: Quotes & Singleton](val qctx: QCtx)(using Context) {
 
     // TODO improve performance
 
@@ -106,9 +109,6 @@ object Matcher {
     import qctx.reflect._
     import Matching._
 
-    def patternHoleSymbol: Symbol
-    def higherOrderHoleSymbol: Symbol
-
     /** A map relating equivalent symbols from the scrutinee and the pattern
      *  For example in
      *  ```
@@ -179,22 +179,22 @@ object Matcher {
           /* Term hole */
           // Match a scala.internal.Quoted.patternHole typed as a repeated argument and return the scrutinee tree
           case (scrutinee @ Typed(s, tpt1), Typed(TypeApply(patternHole, tpt :: Nil), tpt2))
-              if patternHole.symbol == patternHoleSymbol &&
+              if patternHole.symbol.eq(dotc.core.Symbols.defn.QuotedRuntimePatterns_patternHole) &&
                  s.tpe <:< tpt.tpe &&
                  tpt2.tpe.derivesFrom(defn.RepeatedParamClass) =>
             matched(scrutinee.asExpr)
 
           /* Term hole */
           // Match a scala.internal.Quoted.patternHole and return the scrutinee tree
           case (ClosedPatternTerm(scrutinee), TypeApply(patternHole, tpt :: Nil))
-              if patternHole.symbol == patternHoleSymbol &&
+              if patternHole.symbol.eq(dotc.core.Symbols.defn.QuotedRuntimePatterns_patternHole) &&
                  scrutinee.tpe <:< tpt.tpe =>
             matched(scrutinee.asExpr)
 
           /* Higher order term hole */
           // Matches an open term and wraps it into a lambda that provides the free variables
           case (scrutinee, pattern @ Apply(TypeApply(Ident("higherOrderHole"), List(Inferred())), Repeated(args, _) :: Nil))
-              if pattern.symbol == higherOrderHoleSymbol =>
+              if pattern.symbol.eq(dotc.core.Symbols.defn.QuotedRuntimePatterns_higherOrderHole) =>
 
             def bodyFn(lambdaArgs: List[Tree]): Tree = {
               val argsMap = args.map(_.symbol).zip(lambdaArgs.asInstanceOf[List[Term]]).toMap

compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

@@ -2937,10 +2937,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     val qctx1 = QuotesImpl()(using ctx1)
 
-    val matcher = new Matcher.QuoteMatcher[qctx1.type](qctx1) {
-      def patternHoleSymbol: qctx1.reflect.Symbol = dotc.core.Symbols.defn.QuotedRuntimePatterns_patternHole.asInstanceOf
-      def higherOrderHoleSymbol: qctx1.reflect.Symbol = dotc.core.Symbols.defn.QuotedRuntimePatterns_higherOrderHole.asInstanceOf
-    }
+    val matcher = new Matcher.QuoteMatcher[qctx1.type](qctx1)(using ctx1)
 
     val matchings =
       if pat1.isType then matcher.termMatch(scrutinee.asInstanceOf[matcher.qctx.reflect.Term], pat1.asInstanceOf[matcher.qctx.reflect.Term])