Fix scala#4947: Do not replace positions of inlined arguments

Author: nicolasstucki

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

@@ -592,6 +592,8 @@ object Trees {
     extends Tree[T] {
     type ThisTree[-T >: Untyped] = Inlined[T]
     override def initialPos = call.pos
+    /** Is this an argument inlined in an inlined function call */
+    def isInlinedArgument: Boolean = call.isEmpty
   }
 
   /** A type tree that represents an existing or inferred type */

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

@@ -149,12 +149,19 @@ object Inliner {
 
   /** Replace `Inlined` node by a block that contains its bindings and expansion */
   def dropInlined(inlined: tpd.Inlined)(implicit ctx: Context): Tree = {
-    val reposition = new TreeMap {
-      override def transform(tree: Tree)(implicit ctx: Context): Tree = {
-        super.transform(tree).withPos(inlined.call.pos)
+    if (inlined.isInlinedArgument) inlined // remove in the outer inlined call
+    else {
+      val reposition = new TreeMap {
+        override def transform(tree: Tree)(implicit ctx: Context): Tree = tree match {
+          case inlined: Inlined =>
+            // Stop changing positions as this tree already has the correct positions
+            assert(inlined.isInlinedArgument)
+            tpd.seq(inlined.bindings, inlined.expansion)
+          case tree => super.transform(tree).withPos(inlined.call.pos)
+        }
       }
+      tpd.seq(inlined.bindings, reposition.transform(inlined.expansion))
     }
-    tpd.seq(inlined.bindings, reposition.transform(inlined.expansion))
   }
 }
 

tests/run/i4947.check

@@ -0,0 +1,2 @@
+failed
+Test$.main(i4947.scala:9)

tests/run/i4947.scala

@@ -0,0 +1,18 @@
+object Test {
+
+  transparent def track[T](f: => T): T = f
+
+  def main(args: Array[String]): Unit = {
+    try {
+      track {
+        val a = 9
+        throw new Exception("failed")
+      }
+    } catch {
+      case ex: Throwable =>
+        println(ex.getMessage)
+        println(ex.getStackTrace.head)
+    }
+  }
+
+}