Merge pull request #6823 from dotty-staging/remove-implicit-tasty-Reflection-synthesis

Remove implicit `tasty.Reflection` synthesis

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -805,9 +805,6 @@ class Definitions {
   @threadUnsafe lazy val TastyReflectionType: TypeRef = ctx.requiredClassRef("scala.tasty.Reflection")
   def TastyReflectionClass(implicit ctx: Context): ClassSymbol = TastyReflectionType.symbol.asClass
 
-  @threadUnsafe lazy val TastyReflectionModule: TermSymbol = ctx.requiredModule("scala.tasty.Reflection")
-    @threadUnsafe lazy val TastyReflection_macroContext: TermSymbol = TastyReflectionModule.requiredMethod("macroContext")
-
   @threadUnsafe lazy val EqlType: TypeRef = ctx.requiredClassRef("scala.Eql")
   def EqlClass(implicit ctx: Context): ClassSymbol = EqlType.symbol.asClass
   def EqlModule(implicit ctx: Context): Symbol = EqlClass.companionModule

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

@@ -153,7 +153,6 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
     case Some(l) =>
       l == level ||
         level == -1 && (
-          sym == defn.TastyReflection_macroContext ||
           sym == defn.QuoteContext_macroContext ||
             // here we assume that Splicer.canBeSpliced was true before going to level -1,
             // this implies that all non-inline arguments are quoted and that the following two cases are checked

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

@@ -105,7 +105,6 @@ object Splicer {
     protected def interpretVarargs(args: List[Object])(implicit env: Env): Object =
       args.toSeq
 
-    protected def interpretTastyContext()(implicit env: Env): Object = ReflectionImpl(ctx, pos)
     protected def interpretQuoteContext()(implicit env: Env): Object =
       new scala.quoted.QuoteContext(ReflectionImpl(ctx, pos))
 
@@ -278,7 +277,6 @@ object Splicer {
     protected def interpretTypeQuote(tree: tpd.Tree)(implicit env: Env): Unit = ()
     protected def interpretLiteral(value: Any)(implicit env: Env): Unit = ()
     protected def interpretVarargs(args: List[Unit])(implicit env: Env): Unit = ()
-    protected def interpretTastyContext()(implicit env: Env): Unit = ()
     protected def interpretQuoteContext()(implicit env: Env): Unit = ()
     protected def interpretStaticMethodCall(module: Symbol, fn: Symbol, args: => List[Unit])(implicit env: Env): Unit = args.foreach(identity)
     protected def interpretModuleAccess(fn: Symbol)(implicit env: Env): Unit = ()
@@ -314,7 +312,6 @@ object Splicer {
     protected def interpretTypeQuote(tree: Tree)(implicit env: Env): Result
     protected def interpretLiteral(value: Any)(implicit env: Env): Result
     protected def interpretVarargs(args: List[Result])(implicit env: Env): Result
-    protected def interpretTastyContext()(implicit env: Env): Result
     protected def interpretQuoteContext()(implicit env: Env): Result
     protected def interpretStaticMethodCall(module: Symbol, fn: Symbol, args: => List[Result])(implicit env: Env): Result
     protected def interpretModuleAccess(fn: Symbol)(implicit env: Env): Result
@@ -338,9 +335,6 @@ object Splicer {
       case Literal(Constant(value)) =>
         interpretLiteral(value)
 
-      case _ if tree.symbol == defn.TastyReflection_macroContext =>
-        interpretTastyContext()
-
       case _ if tree.symbol == defn.QuoteContext_macroContext =>
         interpretQuoteContext()
 

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

@@ -702,11 +702,6 @@ trait Implicits { self: Typer =>
       }
     }
 
-  lazy val synthesizedTastyContext: SpecialHandler =
-    (formal, span) => implicit ctx =>
-      if (ctx.inInlineMethod || enclosingInlineds.nonEmpty) ref(defn.TastyReflection_macroContext)
-      else EmptyTree
-
   lazy val synthesizedQuoteContext: SpecialHandler =
     (formal, span) => implicit ctx =>
       if (ctx.inInlineMethod || enclosingInlineds.nonEmpty) ref(defn.QuoteContext_macroContext)
@@ -1039,7 +1034,6 @@ trait Implicits { self: Typer =>
         defn.ClassTagClass        -> synthesizedClassTag,
         defn.QuotedTypeClass      -> synthesizedTypeTag,
         defn.QuoteContextClass    -> synthesizedQuoteContext,
-        defn.TastyReflectionClass -> synthesizedTastyContext,
         defn.EqlClass             -> synthesizedEq,
         defn.TupledFunctionClass  -> synthesizedTupleFunction,
         defn.ValueOfClass         -> synthesizedValueOf,

library/src/scala/tasty/Reflection.scala

@@ -46,9 +46,3 @@ class Reflection(val kernel: Kernel)
   }
 
 }
-
-object Reflection {
-  /** Compiler tasty context available in a top level ~ of an inline macro */
-  @deprecated("Use scala.quoted.QuoteContext instead", "0.17")
-  def macroContext: Reflection = throw new Exception("Not in inline macro.")
-}

tests/run-macros/quote-matching-optimize-1/Macro_1.scala

@@ -1,15 +1,11 @@
 import scala.quoted._
 import scala.quoted.autolift._
 
-import scala.tasty.Reflection
-
 object Macro {
 
   inline def optimize[T](x: => T): Any = ${ Macro.impl('x) }
 
-  def impl[T: Type](x: Expr[T]) given Reflection: Expr[Any] = {
-    val reflect = the[Reflection]
-    import reflect._ // TODO remove
+  def impl[T: Type](x: Expr[T]) given QuoteContext: Expr[Any] = {
 
     def optimize(x: Expr[Any]): Expr[Any] = x match {
       case '{ type $t; ($ls: List[`$t`]).filter($f).filter($g) } =>

tests/run-macros/quote-matching-optimize-2/Macro_1.scala

@@ -7,9 +7,7 @@ object Macro {
 
   inline def optimize[T](x: => T): Any = ${ Macro.impl('x) }
 
-  def impl[T: Type](x: Expr[T]) given Reflection: Expr[Any] = {
-    val reflect = the[Reflection]
-    import reflect._ // TODO remove
+  def impl[T: Type](x: Expr[T]) given QuoteContext: Expr[Any] = {
 
     def optimize(x: Expr[Any]): Expr[Any] = x match {
       case '{ ($ls: List[$t]).filter($f).filter($g) } =>

tests/run-macros/quote-matching-optimize-3/Macro_1.scala

@@ -7,9 +7,7 @@ object Macro {
 
   inline def optimize[T](x: => T): Any = ${ Macro.impl('x) }
 
-  def impl[T: Type](x: Expr[T]) given Reflection: Expr[Any] = {
-    val reflect = the[Reflection]
-    import reflect._ // TODO remove
+  def impl[T: Type](x: Expr[T]) given QuoteContext: Expr[Any] = {
 
     def optimize(x: Expr[Any]): Expr[Any] = x match {
       case '{ ($ls: List[$t]).filter($f).filter($g) } =>

tests/run-macros/quoted-pattern-type/Macro_1.scala

@@ -1,11 +1,10 @@
 import scala.quoted._
-import scala.tasty.Reflection
 
 object Lib {
 
   inline def foo[T](arg: => T): T = ${ impl('arg) }
 
-  private def impl[T: Type](arg: Expr[T])(implicit refl: Reflection): Expr[T] = {
+  private def impl[T: Type](arg: Expr[T]) given QuoteContext: Expr[T] = {
     arg match {
       case e @ '{ $x: Boolean } => '{ println("Boolean: " + $e); $e }
       case e @ '{ $x: Int } => '{ println("Int: " + $x); $x }

tests/run-macros/reflect-lambda/assert_1.scala

@@ -1,12 +1,11 @@
 import scala.quoted._
-import scala.tasty._
 
 object lib {
 
   inline def assert(condition: => Boolean): Unit = ${ assertImpl('condition, '{""}) }
 
-  def assertImpl(cond: Expr[Boolean], clue: Expr[Any])(implicit refl: Reflection): Expr[Unit] = {
-    import refl._
+  def assertImpl(cond: Expr[Boolean], clue: Expr[Any]) given (qctx: QuoteContext): Expr[Unit] = {
+    import qctx.tasty._
     import util._
 
     cond.unseal.underlyingArgument match {

tests/run-with-compiler/quote-matcher-type-bind/Macro_1.scala

@@ -1,16 +1,11 @@
 import scala.quoted._
 import scala.quoted.matching._
 
-import scala.tasty.Reflection
-
-import scala.internal.quoted.Matcher._
-import scala.internal.Quoted._
-
 object Macros {
 
   inline def swapFandG(x: => Unit): Unit = ${impl('x)}
 
-  private def impl(x: Expr[Unit])(implicit reflect: Reflection): Expr[Unit] = {
+  private def impl(x: Expr[Unit]) given QuoteContext: Expr[Unit] = {
     x match {
       case '{ DSL.f[$t]($x) } => '{ DSL.g[$t]($x) }
       case '{ DSL.g[$t]($x) } => '{ DSL.f[$t]($x) }

tests/run-with-compiler/reflect-sourceCode/Macro_1.scala

@@ -1,12 +1,11 @@
 import scala.quoted._
-import scala.tasty._
 
 object api {
   inline def (x: => T) reflect[T] : String =
     ${ reflImpl('x) }
 
-  private def reflImpl[T](x: Expr[T])(implicit refl: Reflection): Expr[String] = {
-    import refl._
+  private def reflImpl[T](x: Expr[T])(implicit qctx: QuoteContext): Expr[String] = {
+    import qctx.tasty._
     x.unseal.pos.sourceCode.toExpr
   }
 }