Add missing Inlined nodes on quotes

Author: nicolasstucki

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -391,8 +391,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case SeqLiteral(elems, elemtpt) =>
         "[" ~ toTextGlobal(elems, ",") ~ " : " ~ toText(elemtpt) ~ "]"
       case tree @ Inlined(call, bindings, body) =>
-        (("/* inlined from " ~ toText(call) ~ " */ ") `provided`
-          !call.isEmpty && !homogenizedView && !ctx.settings.YshowNoInline.value) ~
+        (("/* inlined from " ~ (if (call.isEmpty) "outside" else toText(call)) ~ " */ ") `provided`
+          !homogenizedView && !ctx.settings.YshowNoInline.value) ~
         blockText(bindings :+ body)
       case tpt: untpd.DerivedTypeTree =>
         "<derived typetree watching " ~ summarized(toText(tpt.watched)) ~ ">"

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -372,7 +372,20 @@ class ReifyQuotes extends MacroTransformWithImplicits {
           capturers(body.symbol)(body)
         case _=>
           val (body1, splices) = nested(isQuote = true).split(body)
-          if (level == 0 && !ctx.inRewriteMethod) pickledQuote(body1, splices, body.tpe, isType).withPos(quote.pos)
+          if (level == 0 && !ctx.inRewriteMethod) {
+            val body2 =
+              if (body1.isType) body1
+              else {
+                // Leave only a call trace consisting of
+                //  - a reference to the top-level class from which the call was inlined,
+                //  - the call's position
+                // in the call field of an Inlined node.
+                // The trace has enough info to completely reconstruct positions.
+                val callTrace = Ident(ctx.owner.topLevelClass.typeRef).withPos(body1.pos)
+                Inlined(callTrace, Nil, body1)
+              }
+            pickledQuote(body2, splices, body.tpe, isType).withPos(quote.pos)
+          }
           else {
             // In top-level splice in a rewrite def. Keep the tree as it is, it will be transformed at inline site.
             body

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -40,8 +40,10 @@ object Splicer {
       val interpreter = new Interpreter(pos, classLoader)
       try {
         // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree
-        val interpreted = interpreter.interpret[scala.quoted.Expr[Any]](tree)
-        interpreted.fold(tree)(x => PickledQuotes.quotedExprToTree(x))
+        val interpretedExpr = interpreter.interpret[scala.quoted.Expr[Any]](tree)
+        val interpretedTree = interpretedExpr.fold(tree)(x => PickledQuotes.quotedExprToTree(x))
+        // Cancel the current inline trace. The interpreted tree will start with it's own trace.
+        Inlined(EmptyTree, Nil, interpretedTree)
       }
       catch {
         case ex: scala.quoted.QuoteError =>
@@ -286,8 +288,6 @@ object Splicer {
       case NamedArg(_, arg) => interpretTree(arg)
       case Ident(name) if env.contains(name) => env(name)
 
-      case Inlined(EmptyTree, Nil, expansion) => interpretTree(expansion)
-
       case _ => unexpectedTree(tree)
     }
 

tests/run/i4947e.check

@@ -3,5 +3,6 @@ true
 assertImpl: Test$.main(Test_2.scala:8)
 false
 assertImpl: Test$.main(Test_2.scala:9)
-hi: Test$.main(Test_2.scala:9)
+hi: Test$.main(Test_2.scala:10)
+hi again: Test$.main(Test_2.scala:11)
 false

tests/run/i4947e/Test_2.scala

@@ -6,6 +6,10 @@ object Test {
     val x = 1
     assert2(x != 0)
     assert2(x == 0)
-    assert2 { Macros.printStack("hi"); x == 0 }
+    assert2 {
+      Macros.printStack("hi")
+      Macros.printStack("hi again")
+      x == 0
+    }
   }
 }