Backport "Fix erasure crash for Inlined rhs of a context function clo…

…sure" to LTS (#21114) Backports #20398 to the LTS branch. PR submitted by the release tooling. [skip ci]
scala · Jul 8, 2024 · 7c1bb85 · 7c1bb85
2 parents 1537ae1 + d441dae
commit 7c1bb85
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala
@@ -936,6 +936,8 @@ object Erasure {
                   vparams = vparams :+ param
               if crCount == 1 then meth.rhs.changeOwnerAfter(meth.symbol, sym, erasurePhase)
               else skipContextClosures(meth.rhs, crCount - 1)
+            case inlined: Inlined =>
+              skipContextClosures(Inlines.dropInlined(inlined), crCount)
 
         var rhs1 = skipContextClosures(ddef.rhs.asInstanceOf[Tree], contextResultCount(sym))
 

diff --git a/tests/pos-macros/i16963/Macro_1.scala b/tests/pos-macros/i16963/Macro_1.scala
@@ -0,0 +1,14 @@
+import scala.quoted.*
+
+inline def myMacro = ${ myMacroExpr }
+
+def myMacroExpr(using Quotes) =
+  import quotes.reflect.*
+
+  '{ def innerMethod = (_: String) ?=> ???; () }.asTerm match
+    case block @ Inlined(_, _, Block(List(defdef: DefDef), _)) =>
+      val rhs =
+        given Quotes = defdef.symbol.asQuotes
+        '{ (x: String) ?=> ??? }.asTerm
+
+      Block(List(DefDef(defdef.symbol, _ => Some(rhs))), '{}.asTerm).asExprOf[Unit]
diff --git a/tests/pos-macros/i16963/Test_2.scala b/tests/pos-macros/i16963/Test_2.scala
@@ -0,0 +1 @@
+def method: Unit = myMacro