Fix owner in ValDef.let

Author: nicolasstucki

compiler/src/scala/quoted/internal/impl/QuoteContextImpl.scala

@@ -278,13 +278,14 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
       def unapply(vdef: ValDef): Option[(String, TypeTree, Option[Term])] =
         Some((vdef.name.toString, vdef.tpt, optional(vdef.rhs)))
 
-      def let(name: String, rhs: Term)(body: Ident => Term): Term =
-        val vdef = tpd.SyntheticValDef(name.toTermName, rhs)
+      def let(name: String, rhs: Term)(body: Ident => Term)(using owner: Owner): Term =
+        val vdef = tpd.SyntheticValDef(name.toTermName, rhs)(using ctx.withOwner(owner))
         val ref = tpd.ref(vdef.symbol).asInstanceOf[Ident]
         Block(List(vdef), body(ref))
 
-      def let(terms: List[Term])(body: List[Ident] => Term): Term =
-        val vdefs = terms.map(term => tpd.SyntheticValDef("x".toTermName, term))
+      def let(terms: List[Term])(body: List[Ident] => Term)(using owner: Owner): Term =
+        val ctx1 = ctx.withOwner(owner)
+        val vdefs = terms.map(term => tpd.SyntheticValDef("x".toTermName, term)(using ctx1))
         val refs = vdefs.map(vdef => tpd.ref(vdef.symbol).asInstanceOf[Ident])
         Block(vdefs, body(refs))
     end ValDef

library/src/scala/quoted/QuoteContext.scala

@@ -388,13 +388,13 @@ trait QuoteContext { self: internal.QuoteUnpickler & internal.QuoteMatching =>
       def unapply(vdef: ValDef): Option[(String, TypeTree, Option[Term])]
 
       /** Creates a block `{ val <name> = <rhs: Term>; <body(x): Term> }` */
-      def let(name: String, rhs: Term)(body: Ident => Term): Term
+      def let(name: String, rhs: Term)(body: Ident => Term)(using owner: Owner): Term
 
       /** Creates a block `{ val x = <rhs: Term>; <body(x): Term> }` */
-      def let(rhs: Term)(body: Ident => Term): Term = let("x", rhs)(body)
+      def let(rhs: Term)(body: Ident => Term)(using owner: Owner): Term = let("x", rhs)(body)
 
       /** Creates a block `{ val x1 = <terms(0): Term>; ...; val xn = <terms(n-1): Term>; <body(List(x1, ..., xn)): Term> }` */
-      def let(terms: List[Term])(body: List[Ident] => Term): Term
+      def let(terms: List[Term])(body: List[Ident] => Term)(using owner: Owner): Term
     }
 
     given ValDefMethods as ValDefMethods = ValDefMethodsImpl