Merge pull request #13644 from dotty-staging/mb/splice-position-backport

[Backport] Fix Positioned#cloneIn to also update the source

Author: mbovel

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

@@ -23,6 +23,8 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
 
   private var mySpan: Span = _
 
+  private var mySource: SourceFile = src
+
   /** A unique identifier in case -Yshow-tree-ids, or -Ydebug-tree-with-id
    *  is set, -1 otherwise.
    */
@@ -48,7 +50,8 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
 
   span = envelope(src)
 
-  val source: SourceFile = src
+  def source: SourceFile = mySource
+
   def sourcePos(using Context): SourcePosition = source.atSpan(span)
 
   /** This positioned item, widened to `SrcPos`. Used to make clear we only need the
@@ -127,7 +130,7 @@ abstract class Positioned(implicit @constructorOnly src: SourceFile) extends Src
   def cloneIn(src: SourceFile): this.type = {
     val newpd: this.type = clone.asInstanceOf[this.type]
     newpd.allocateId()
-    // assert(newpd.uniqueId != 2208, s"source = $this, ${this.uniqueId}, ${this.span}")
+    newpd.mySource = src
     newpd
   }
 

tests/run/splice-position.check

@@ -0,0 +1,2 @@
+Test$.main(Test.scala:3)
+Test$.main(Test.scala:4)

tests/run/splice-position/Test.scala

@@ -0,0 +1,4 @@
+object Test:
+  def main(args: Array[String]) =
+    try assertTrue(1 == 2) catch e => println(e.getStackTrace()(0))
+    try assertTrue(1 == 3) catch e => println(e.getStackTrace()(0))

tests/run/splice-position/macros.scala

@@ -0,0 +1,7 @@
+import scala.quoted.{Quotes, Expr, quotes}
+
+inline def assertTrue(cond: Boolean) =
+  ${ assertTrueImpl('cond) }
+
+def assertTrueImpl(cond: Expr[Boolean])(using Quotes) =
+  '{ if (!$cond) throw new Error(${'{""}}) }