Fix #7715: Fix Inlined.{isTerm,isType} and case with Inlined(Nil, ...)

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -621,6 +621,8 @@ object Trees {
   case class Inlined[-T >: Untyped] private[ast] (call: tpd.Tree, bindings: List[MemberDef[T]], expansion: Tree[T])(implicit @constructorOnly src: SourceFile)
     extends Tree[T] {
     type ThisTree[-T >: Untyped] = Inlined[T]
+    override def isTerm = expansion.isTerm
+    override def isType = expansion.isType
   }
 
   /** A type tree that represents an existing or inferred type */

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -1070,7 +1070,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
             transform(rhs)
           case _ => tree
         }
-      case Inlined(_, _, arg) => transform(arg)
+      case Inlined(_, Nil, arg) => transform(arg)
       case Block(Nil, arg) => transform(arg)
       case NamedArg(_, arg) => transform(arg)
       case tree => super.transform(tree)

compiler/src/dotty/tools/dotc/tastyreflect/ReflectionCompilerInterface.scala

@@ -250,9 +250,9 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
     def runtimeClass: Class[?] = classOf[Term]
     override def unapply(x: Any): Option[Term] = x match
       case _ if isInstanceOfUnapply.unapply(x).isDefined => None
-      case _: PatternTree => None
+      case _: tpd.PatternTree => None
       case x: tpd.SeqLiteral => Some(x)
-      case x: Tree if x.isTerm => Some(x)
+      case x: tpd.Tree if x.isTerm => Some(x)
       case _ => None
   }
 

tests/run-macros/i7715.check

@@ -0,0 +1,6 @@
+import scala.quoted.{ given, _ }
+
+inline def mcr(e: => Any): Any = ${mcrImpl('e)}
+def mcrImpl(e: Expr[Any])(given ctx: QuoteContext): Expr[Any] =
+  e match
+    case '{ $body } => body

tests/run-macros/i7715/Macros_1.scala

@@ -0,0 +1,2 @@
+given Int = 5
+@main def Test = assert(5 == mcr(summon[Int]))