Skip to content
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.

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

Compute debug messages lazily in safe init #12484

Merged
merged 1 commit into from
May 14, 2021
Merged
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions compiler/src/dotty/tools/dotc/transform/init/Util.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ import config.Printers.Printer
import annotation.tailrec

object Util {
def traceIndented(msg: String, printer: Printer)(using Context): Unit =
def traceIndented(msg: => String, printer: Printer)(using Context): Unit =
printer.println(s"${ctx.base.indentTab * ctx.base.indent} $msg")

def traceOp(msg: String, printer: Printer)(op: => Unit)(using Context): Unit = {
traceIndented(s"==> ${msg}", printer)
def traceOp(msg: => String, printer: Printer)(op: => Unit)(using Context): Unit = {
lazy val computedMsg = msg // Make sure we only compute msg once
traceIndented(s"==> ${computedMsg}", printer)
op
traceIndented(s"<== ${msg}", printer)
traceIndented(s"<== ${computedMsg}", printer)
}

extension (symbol: Symbol) def hasSource(using Context): Boolean =
Expand All @@ -38,4 +39,4 @@ object Util {
}
loop(cls.info.baseClasses.dropWhile(sym.owner != _))
}
}
}