Merge pull request #282 from scala/backport-lts-3.3-22716

Backport "Make sure Block does not incorrectly match a TypeBlock" to 3.3 LTS

Author: tgodzik

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

@@ -805,7 +805,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
 
     object BlockTypeTest extends TypeTest[Tree, Block]:
       def unapply(x: Tree): Option[Block & x.type] = x match
-        case x: (tpd.Block & x.type) => Some(x)
+        case x: (tpd.Block & x.type) if x.isTerm => Some(x)
         case _ => None
     end BlockTypeTest
 

tests/pos/i21721/Macro.scala renamed to tests/pos-macros/i21721-a/Macro.scala

@@ -0,0 +1,11 @@
+import scala.quoted._
+
+inline def test(): Any = ${ testImpl }
+
+def testImpl(using Quotes): Expr[Any] =
+  import quotes.reflect._
+  TypeBlock(Nil, TypeTree.of[Int]) match
+    case Block(_, res) =>
+      res.asExpr // unexpected case - would crash here, as res of TypeBlock is not a term
+    case _ =>
+      '{()} // expected case

tests/pos/i21721/Test.scala renamed to tests/pos-macros/i21721-a/Test.scala

@@ -0,0 +1 @@
+@main def Test() = test()