Merge pull request #13492 from dotty-staging/fix-#13477

Use correct context when creating inline trace
scala · Sep 9, 2021 · 2b74f88 · 2b74f88
2 parents 8e92478 + 6c33e1b
commit 2b74f88
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala
@@ -304,8 +304,9 @@ object Inliner {
    */
   def inlineCallTrace(callSym: Symbol, pos: SourcePosition)(using Context): Tree = {
     assert(ctx.source == pos.source)
-    if (callSym.is(Macro)) ref(callSym.topLevelClass.owner).select(callSym.topLevelClass.name).withSpan(pos.span)
-    else Ident(callSym.topLevelClass.typeRef).withSpan(pos.span)
+    val topLevelCls = callSym.topLevelClass
+    if (callSym.is(Macro)) ref(topLevelCls.owner).select(topLevelCls.name)(using ctx.withOwner(topLevelCls.owner)).withSpan(pos.span)
+    else Ident(topLevelCls.typeRef).withSpan(pos.span)
   }
 
   object Intrinsics {

diff --git a/tests/pos-macros/i13477/Macro.scala b/tests/pos-macros/i13477/Macro.scala
@@ -0,0 +1,8 @@
+package mylib
+import scala.quoted.*
+
+private[mylib] object Main:
+  transparent inline def d(): Unit = ${interpMacro}
+  def interpMacro(using Quotes) : Expr[Unit] = '{}
+
+transparent inline def f(): Unit = Main.d()
diff --git a/tests/pos-macros/i13477/Test.scala b/tests/pos-macros/i13477/Test.scala
@@ -0,0 +1,2 @@
+import mylib.*
+val x = f()