Extract reusable code

Author: liufengyun

compiler/src/dotty/tools/dotc/transform/init/Cache.scala

@@ -0,0 +1,132 @@
+package dotty.tools.dotc
+package transform
+package init
+
+import core.*
+import Contexts.*
+
+import ast.tpd
+import tpd.Tree
+
+class Cache[Config, Res]:
+  import Cache.*
+
+  /** The cache for expression values from last iteration */
+  protected var last: ExprValueCache[Config, Res] =  Map.empty
+
+  /** The output cache for expression values
+   *
+   *  The output cache is computed based on the cache values `last` from the
+   *  last iteration.
+   *
+   *  Both `last` and `current` are required to make sure an encountered
+   *  expression is evaluated once in each iteration.
+   */
+  protected var current: ExprValueCache[Config, Res] = Map.empty
+
+  /** Whether the current heap is different from the last heap?
+   *
+   *  `changed == false` implies that the fixed point has been reached.
+   */
+  protected var changed: Boolean = false
+
+  /** Used to avoid allocation, its state does not matter */
+  protected given MutableTreeWrapper = new MutableTreeWrapper
+
+  def get(config: Config, expr: Tree): Option[Res] =
+    current.get(config, expr)
+
+  /** Copy the value (config, expr)` from the last cache to the current cache
+   *
+   *  It assumes `default` if it doesn't exist in the last cache.
+   *
+   *  It updates the current caches if the values change.
+   *
+   *  The two caches are required because we want to make sure in a new iteration, an expression is evaluated once.
+   */
+  def cachedEval(config: Config, expr: Tree, cacheResult: Boolean, default: Res)(eval: => Res): Res =
+    this.get(config, expr) match
+    case Some(value) => value
+    case None =>
+      val assumeValue: Res =
+        last.get(config, expr) match
+        case Some(value) => value
+        case None =>
+          this.last = last.updatedNested(config, expr, default)
+          default
+
+      this.current = current.updatedNested(config, expr, assumeValue)
+
+      val actual = eval
+      if actual != assumeValue then
+        // println("Changed! from = " + assumeValue + ", to = " + actual)
+        this.changed = true
+        // TODO: respect cacheResult to reduce cache size
+        this.current = this.current.updatedNested(config, expr, actual)
+        // this.current = this.current.removed(config, expr)
+      end if
+
+      actual
+  end cachedEval
+
+  def hasChanged = changed
+
+  /** Prepare cache for the next iteration
+   *
+   *  1. Reset changed flag.
+   *
+   *  2. Use current cache as last cache and set current cache to be empty.
+   */
+  def prepareForNextIteration()(using Context) =
+    this.changed = false
+    this.last = this.current
+    this.current = Map.empty
+end Cache
+
+object Cache:
+  type ExprValueCache[Config, Res] = Map[Config, Map[TreeWrapper, Res]]
+
+  /** A wrapper for trees for storage in maps based on referential equality of trees. */
+  abstract class TreeWrapper:
+    def tree: Tree
+
+    override final def equals(other: Any): Boolean =
+      other match
+      case that: TreeWrapper => this.tree eq that.tree
+      case _ => false
+
+    override final def hashCode = tree.hashCode
+
+  /** The immutable wrapper is intended to be stored as key in the heap. */
+  class ImmutableTreeWrapper(val tree: Tree) extends TreeWrapper
+
+  /** For queries on the heap, reuse the same wrapper to avoid unnecessary allocation.
+   *
+   *  A `MutableTreeWrapper` is only ever used temporarily for querying a map,
+   *  and is never inserted to the map.
+   */
+  class MutableTreeWrapper extends TreeWrapper:
+    var queryTree: Tree | Null = null
+    def tree: Tree = queryTree match
+      case tree: Tree => tree
+      case null => ???
+
+  extension [Config, Res](cache: ExprValueCache[Config, Res])
+    def get(config: Config, expr: Tree)(using queryWrapper: MutableTreeWrapper): Option[Res] =
+      queryWrapper.queryTree = expr
+      cache.get(config).flatMap(_.get(queryWrapper))
+
+    def removed(config: Config, expr: Tree)(using queryWrapper: MutableTreeWrapper) =
+      queryWrapper.queryTree = expr
+      val innerMap2 = cache(config).removed(queryWrapper)
+      cache.updated(config, innerMap2)
+
+    def updatedNested(config: Config, expr: Tree, result: Res): ExprValueCache[Config, Res] =
+      val wrapper = new ImmutableTreeWrapper(expr)
+      updatedNestedWrapper(config, wrapper, result)
+
+    def updatedNestedWrapper(config: Config, wrapper: ImmutableTreeWrapper, result: Res): ExprValueCache[Config, Res] =
+      val innerMap = cache.getOrElse(config, Map.empty[TreeWrapper, Res])
+      val innerMap2 = innerMap.updated(wrapper, result)
+      cache.updated(config, innerMap2)
+  end extension

compiler/src/dotty/tools/dotc/transform/init/Errors.scala

@@ -5,106 +5,61 @@ package init
 
 import ast.tpd._
 import core._
-import util.SourcePosition
 import util.Property
-import Decorators._, printing.SyntaxHighlighting
+import util.SourcePosition
 import Types._, Symbols._, Contexts._
 
-import scala.collection.mutable
+import Trace.Trace
 
 object Errors:
   private val IsFromPromotion = new Property.Key[Boolean]
 
   sealed trait Error:
-    def trace: Seq[Tree]
+    def trace: Trace
     def show(using Context): String
 
-    def pos(using Context): SourcePosition = trace.last.sourcePos
+    def pos(using Context): SourcePosition = Trace.position(using trace).sourcePos
 
     def stacktrace(using Context): String =
       val preamble: String =
         if ctx.property(IsFromPromotion).nonEmpty
         then " Promotion trace:\n"
         else " Calling trace:\n"
-      buildStacktrace(trace, preamble)
+      Trace.buildStacktrace(trace, preamble)
 
     def issue(using Context): Unit =
       report.warning(show, this.pos)
   end Error
 
-  def buildStacktrace(trace: Seq[Tree], preamble: String)(using Context): String = if trace.isEmpty then "" else preamble + {
-    var lastLineNum = -1
-    var lines: mutable.ArrayBuffer[String] = new mutable.ArrayBuffer
-    trace.foreach { tree =>
-      val pos = tree.sourcePos
-      val prefix = "-> "
-      val line =
-        if pos.source.exists then
-          val loc = "[ " + pos.source.file.name + ":" + (pos.line + 1) + " ]"
-          val code = SyntaxHighlighting.highlight(pos.lineContent.trim.nn)
-          i"$code\t$loc"
-        else
-          tree.show
-      val positionMarkerLine =
-        if pos.exists && pos.source.exists then
-          positionMarker(pos)
-        else ""
-
-      // always use the more precise trace location
-      if lastLineNum == pos.line then
-        lines.dropRightInPlace(1)
-
-      lines += (prefix + line + "\n" + positionMarkerLine)
-
-      lastLineNum = pos.line
-    }
-    val sb = new StringBuilder
-    for line <- lines do sb.append(line)
-    sb.toString
-  }
-
-  /** Used to underline source positions in the stack trace
-   *  pos.source must exist
-   */
-  private def positionMarker(pos: SourcePosition): String =
-    val trimmed = pos.lineContent.takeWhile(c => c.isWhitespace).length
-    val padding = pos.startColumnPadding.substring(trimmed).nn + "   "
-    val carets =
-      if (pos.startLine == pos.endLine)
-        "^" * math.max(1, pos.endColumn - pos.startColumn)
-      else "^"
-
-    s"$padding$carets\n"
-
   override def toString() = this.getClass.getName.nn
 
   /** Access non-initialized field */
-  case class AccessNonInit(field: Symbol)(val trace: Seq[Tree]) extends Error:
-    def source: Tree = trace.last
+  case class AccessNonInit(field: Symbol)(val trace: Trace) extends Error:
+    def source: Tree = Trace.position(using trace)
     def show(using Context): String =
       "Access non-initialized " + field.show + "." + stacktrace
 
     override def pos(using Context): SourcePosition = field.sourcePos
 
   /** Promote a value under initialization to fully-initialized */
-  case class PromoteError(msg: String)(val trace: Seq[Tree]) extends Error:
+  case class PromoteError(msg: String)(val trace: Trace) extends Error:
     def show(using Context): String = msg + stacktrace
 
-  case class AccessCold(field: Symbol)(val trace: Seq[Tree]) extends Error:
+  case class AccessCold(field: Symbol)(val trace: Trace) extends Error:
     def show(using Context): String =
       "Access field " + field.show +  " on a cold object." + stacktrace
 
-  case class CallCold(meth: Symbol)(val trace: Seq[Tree]) extends Error:
+  case class CallCold(meth: Symbol)(val trace: Trace) extends Error:
     def show(using Context): String =
       "Call method " + meth.show + " on a cold object." + stacktrace
 
-  case class CallUnknown(meth: Symbol)(val trace: Seq[Tree]) extends Error:
+  case class CallUnknown(meth: Symbol)(val trace: Trace) extends Error:
     def show(using Context): String =
       val prefix = if meth.is(Flags.Method) then "Calling the external method " else "Accessing the external field"
       prefix + meth.show + " may cause initialization errors." + stacktrace
 
   /** Promote a value under initialization to fully-initialized */
-  case class UnsafePromotion(msg: String, error: Error)(val trace: Seq[Tree]) extends Error:
+  case class UnsafePromotion(msg: String, error: Error)(val trace: Trace) extends Error:
     def show(using Context): String =
       msg + stacktrace + "\n" +
         "Promoting the value to hot (transitively initialized) failed due to the following problem:\n" + {
@@ -116,7 +71,7 @@ object Errors:
    *
    *  Invariant: argsIndices.nonEmpty
    */
-  case class UnsafeLeaking(error: Error, nonHotOuterClass: Symbol, argsIndices: List[Int])(val trace: Seq[Tree]) extends Error:
+  case class UnsafeLeaking(error: Error, nonHotOuterClass: Symbol, argsIndices: List[Int])(val trace: Trace) extends Error:
     def show(using Context): String =
       "Problematic object instantiation: " + argumentInfo() + stacktrace + "\n" +
         "It leads to the following error during object initialization:\n" +