Fix owner of spices in class statements

Fixes #18358 [Cherry-picked 525e93c]
scala · Dec 7, 2023 · 5a4d683 · 5a4d683
1 parent 0c0b48d
commit 5a4d683
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala
@@ -98,7 +98,7 @@ object PickledQuotes {
 
   /** Replace all term holes with the spliced terms */
   private def spliceTerms(tree: Tree, typeHole: TypeHole, termHole: ExprHole)(using Context): Tree = {
-    def evaluateHoles = new TreeMap {
+    def evaluateHoles = new TreeMapWithPreciseStatContexts {
       override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
         case Hole(isTerm, idx, args, _) =>
           inContext(SpliceScope.contextWithNewSpliceScope(tree.sourcePos)) {

diff --git a/tests/pos-macros/i18358/Macro_1.scala b/tests/pos-macros/i18358/Macro_1.scala
@@ -0,0 +1,4 @@
+import scala.quoted.*
+inline def generateCode: Unit = ${ testLocalDummyOwner }
+def testLocalDummyOwner(using Quotes): Expr[Unit] = '{ trait E { $valInBlock } }
+def valInBlock(using Quotes): Expr[Unit] = '{ val x: Int = 2; () }
diff --git a/tests/pos-macros/i18358/Test_2.scala b/tests/pos-macros/i18358/Test_2.scala
@@ -0,0 +1 @@
+def test = generateCode