Cache staticRef

Per-run cache of what is returned for a staticRef

Author: odersky

compiler/src/dotty/tools/dotc/Run.scala

@@ -7,6 +7,8 @@ import Periods._
 import Symbols._
 import Types._
 import Scopes._
+import Names.Name
+import Denotations.Denotation
 import typer.Typer
 import typer.ImportInfo._
 import Decorators._
@@ -116,6 +118,9 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
   /** The source files of all late entered symbols, as a set */
   private var lateFiles = mutable.Set[AbstractFile]()
 
+  /** A cache for static references to packages and classes */
+  val staticRefs = util.IdentityHashMap[Name, Denotation](initialCapacity = 1024)
+
   /** Actions that need to be performed at the end of the current compilation run */
   private var finalizeActions = mutable.ListBuffer[() => Unit]()
 

compiler/src/dotty/tools/dotc/core/Denotations.scala

@@ -1259,7 +1259,8 @@ object Denotations {
         }
         recurSimple(path.length, wrap)
     }
-    recur(path)
+    if ctx.run == null then recur(path)
+    else ctx.run.staticRefs.getOrElseUpdate(path, recur(path))
   }
 
 

compiler/src/dotty/tools/dotc/util/GenericHashMap.scala

@@ -117,6 +117,11 @@ abstract class GenericHashMap[Key <: AnyRef, Value >: Null <: AnyRef]
       idx = nextIndex(idx)
       k = keyAt(idx)
 
+  def getOrElseUpdate(key: Key, value: => Value): Value =
+    var v = lookup(key)
+    if v == null then v = value
+    v
+
   private def addOld(key: Key, value: AnyRef): Unit =
     Stats.record(statsItem("re-enter"))
     var idx = firstIndex(key)