Skip to content

Backport "-Yprofile-trace properly report macro splicing source" to 3.3 LTS #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2025
Merged

Backport "-Yprofile-trace properly report macro splicing source" to 3.3 LTS #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a290a41
-Yprofile-trace properly report macro splicing source
smarter Jul 8, 2025
6230788
bugfix: Fix diverging tests
tgodzik Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions compiler/src/dotty/tools/dotc/inlines/Inliner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,9 +1098,10 @@ class Inliner(val call: tpd.Tree)(using Context):
if suspendable then
ctx.compilationUnit.suspend() // this throws a SuspendException

val evaluatedSplice = inContext(quoted.MacroExpansion.context(inlinedFrom)) {
Splicer.splice(body, splicePos, inlinedFrom.srcPos, MacroClassLoader.fromContext)
}
val evaluatedSplice =
inContext(quoted.MacroExpansion.context(inlinedFrom)):
ctx.profiler.onMacroSplice(inlinedFrom.symbol):
Splicer.splice(body, splicePos, inlinedFrom.srcPos, MacroClassLoader.fromContext)
val inlinedNormalizer = new TreeMap {
override def transform(tree: tpd.Tree)(using Context): tpd.Tree = tree match {
case tree @ Inlined(_, Nil, expr) if tree.inlinedFromOuterScope && enclosingInlineds.isEmpty => transform(expr)
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/Splicer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ object Splicer {
inContext(sliceContext) {
val oldContextClassLoader = Thread.currentThread().getContextClassLoader
Thread.currentThread().setContextClassLoader(classLoader)
try ctx.profiler.onMacroSplice(owner){
try {
val interpreter = new SpliceInterpreter(splicePos, classLoader)

// Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree
Expand Down
2 changes: 1 addition & 1 deletion tests/neg/i13044.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- [E172] Type Error: tests/neg/i13044.scala:46:40 ---------------------------------------------------------------------
-- [E172] Type Error: tests/neg/i13044.scala:61:40 ---------------------------------------------------------------------
61 | implicit def typeSchema: Schema[A] = Schema.gen // error
| ^^^^^^^^^^
| No given instance of type Schema[B] was found.
Expand Down
17 changes: 16 additions & 1 deletion tests/neg/i13044.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,22 @@ trait SchemaDerivation {
inline given gen[A]: Schema[A] = derived
}

case class H(i: Int)
case class X15(i: Int)
case class X14(i: X15)
case class X13(i: X14)
case class X12(i: X13)
case class X11(i: X12)
case class X10(i: X11)
case class X9(i: X10)
case class X8(i: X9)
case class X7(i: X8)
case class X6(i: X7)
case class X5(i: X6)
case class X4(i: X5)
case class X3(i: X4)
case class X2(i: X3)
case class X1(i: X2)
case class H(i: X1)
case class G(h: H)
case class F(g: G)
case class E(f: Option[F])
Expand Down
Loading