Populate addresses of symbols and types after pickler

To allow other phases to generate their info.

Author: DarkDimius

src/dotty/tools/dotc/CompilationUnit.scala

@@ -1,10 +1,12 @@
 package dotty.tools
 package dotc
 
+import dotty.tools.dotc.core.Types.Type
 import dotty.tools.dotc.core.pickling.{TastyBuffer, TastyPickler}
 import util.SourceFile
 import ast.{tpd, untpd}
 import TastyBuffer._
+import dotty.tools.dotc.core.Symbols._
 
 class CompilationUnit(val source: SourceFile) {
 
@@ -19,4 +21,8 @@ class CompilationUnit(val source: SourceFile) {
   lazy val pickled: TastyPickler = new TastyPickler()
 
   var addrOfTree: tpd.Tree => Option[Addr] = (_ => None)
+
+  var addrOfSym: Symbol => Option[Addr] = (_ => None)
+
+  var addrOfType: Type => Option[Addr] = (_ => None)
 }

src/dotty/tools/dotc/core/pickling/TreePickler.scala

@@ -19,14 +19,22 @@ class TreePickler(pickler: TastyPickler) {
 
   private val symRefs = new mutable.HashMap[Symbol, Addr]
   private val forwardSymRefs = new mutable.HashMap[Symbol, List[Addr]]
-  private val pickledTypes = new java.util.IdentityHashMap[Type, Any] // Value type is really Addr, but that's not compatible with null
+  private val pickledTypes = new mutable.HashMap[Type, Addr]
 
   private def withLength(op: => Unit) = {
     val lengthAddr = reserveRef(relative = true)
     op
     fillRef(lengthAddr, currentAddr, relative = true)
   }
-  
+
+  def addrOfSym(sym: Symbol): Option[Addr] = {
+    symRefs.get(sym)
+  }
+
+  def addrOfType(tp: Type): Option[Addr] = {
+    pickledTypes.get(tp)
+  }
+
   private var makeSymbolicRefsTo: Symbol = NoSymbol
 
   /** All references to members of class `sym` are pickled

src/dotty/tools/dotc/transform/Pickler.scala

@@ -36,6 +36,8 @@ class Pickler extends Phase {
       val treePkl = new TreePickler(pickler)
       treePkl.pickle(tree :: Nil)
       unit.addrOfTree = treePkl.buf.addrOfTree
+      unit.addrOfSym = treePkl.addrOfSym
+      unit.addrOfType = treePkl.addrOfType
       if (tree.pos.exists)
         new PositionPickler(pickler, treePkl.buf.addrOfTree).picklePositions(tree :: Nil, tree.pos)