Fix placement of Inlined cancelation

Author: nicolasstucki

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

@@ -244,6 +244,8 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
           //     be duplicated
           //  2. To enable correct pickling (calls can share symbols with the inlined code, which
           //     would trigger an assertion when pickling).
+          //
+          // This is the same trace that is inserted in ReifyQuotes.quotation
           val callTrace = Ident(call.symbol.topLevelClass.typeRef).withPos(call.pos)
           cpy.Inlined(tree)(callTrace, transformSub(bindings), transform(expansion)(inlineContext(call)))
         case tree: Template =>

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

@@ -381,7 +381,9 @@ class ReifyQuotes extends MacroTransformWithImplicits {
                 //  - 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)
+                //
+                // This is the same trace that is inserted in PostTyper.transform
+                val callTrace = Ident(ctx.owner.topLevelClass.typeRef).withPos(quote.pos)
                 Inlined(callTrace, Nil, body1)
               }
             pickledQuote(body2, splices, body.tpe, isType).withPos(quote.pos)
@@ -435,7 +437,8 @@ class ReifyQuotes extends MacroTransformWithImplicits {
       }
       else if (level == 1) {
         val (body1, quotes) = nested(isQuote = false).split(splice.qualifier)
-        makeHole(body1, quotes, splice.tpe).withPos(splice.pos)
+        val hole = makeHole(body1, quotes, splice.tpe).withPos(splice.pos)
+        if (splice.isType) hole else Inlined(EmptyTree, Nil, hole)
       }
       else if (enclosingInlineds.nonEmpty) { // level 0 in an inlined call
         val spliceCtx = ctx.outer // drop the last `inlineContext`

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

@@ -41,9 +41,7 @@ object Splicer {
       try {
         // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree
         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)
+        interpretedExpr.fold(tree)(x => PickledQuotes.quotedExprToTree(x))
       }
       catch {
         case ex: scala.quoted.QuoteError =>

tests/run/i4947f.check

@@ -0,0 +1,8 @@
+assertImpl: Test$.main(Test_2.scala:7)
+true
+assertImpl: Test$.main(Test_2.scala:8)
+false
+assertImpl: Test$.main(Test_2.scala:9)
+hi: Test$.main(Test_2.scala:10)
+hi again: Test$.main(Test_2.scala:11)
+false

tests/run/i4947f/Macro_1.scala

@@ -0,0 +1,14 @@
+import scala.quoted._
+
+object Macros {
+  def printStack(tag: String): Unit = {
+    println(tag + ": "+ new Exception().getStackTrace().apply(1))
+  }
+  def assertImpl(expr: Expr[Boolean]) = '{
+    printStack("assertImpl")
+    println(~expr)
+  }
+
+  rewrite def assert2(expr: => Boolean): Unit =  ~Macros.assertImpl('(expr))
+
+}

tests/run/i4947f/Test_2.scala

@@ -0,0 +1,15 @@
+object Test {
+
+  import Macros._
+
+  def main(args: Array[String]): Unit = {
+    val x = 1
+    assert2(x != 0)
+    assert2(x == 0)
+    assert2 {
+      Macros.printStack("hi")
+      Macros.printStack("hi again")
+      x == 0
+    }
+  }
+}