Merge pull request #10801 from dotty-staging/fix-JSR-45-repositioning

Fix JSR-45 repositioning

Author: nicolasstucki

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -238,9 +238,10 @@ object Inliner {
     class Reposition extends TreeMap(cpyWithNewSource) {
 
       override def transform(tree: Tree)(using Context): Tree = {
+        def fixSpan[T <: untpd.Tree](copied: T): T =
+          copied.withSpan(if tree.source == curSource then tree.span else callSpan)
         def finalize(copied: untpd.Tree) =
-          val span = if tree.source == curSource then tree.span else callSpan
-          copied.withSpan(span).withAttachmentsFrom(tree).withTypeUnchecked(tree.tpe)
+          fixSpan(copied).withAttachmentsFrom(tree).withTypeUnchecked(tree.tpe)
 
         inContext(ctx.withSource(curSource)) {
           tree match
@@ -252,7 +253,8 @@ object Inliner {
             case tree: Bind => finalize(untpd.Bind(tree.name, transform(tree.body))(curSource))
             case tree: TypeTree => finalize(tpd.TypeTree(tree.tpe))
             case tree: DefTree => super.transform(tree).setDefTree
-            case _ => super.transform(tree)
+            case EmptyTree => tree
+            case _ => fixSpan(super.transform(tree))
         }
       }
     }

tests/run/assert-stack.check

@@ -0,0 +1,6 @@
+scala.runtime.Scala3RunTime$.assertFailed(Scala3RunTime.scala:8)
+Test$.main(assert-stack.scala:7)
+
+scala.runtime.Scala3RunTime$.assertFailed(Scala3RunTime.scala:11)
+Test$.main(assert-stack.scala:12)
+

tests/run/assert-stack.scala

@@ -0,0 +1,22 @@
+
+
+object Test {
+
+  def main(args: Array[String]): Unit = {
+    try
+      assert(false, "my message")
+    catch
+      case ae: AssertionError => printStack(ae)
+
+    try
+      assert(false)
+    catch
+      case ae: AssertionError => printStack(ae)
+  }
+
+  def printStack(ae: AssertionError): Unit =
+    for elem <- ae.getStackTrace().iterator.takeWhile(x => !(x.getMethodName == "main" && x.getLineNumber == -1)) do
+      println(elem)
+    println()
+
+}