Merge pull request #2582 from paulp/pr/SubstTypeMap

Cache the most recently created SubstTypeMap.

2 files changed, 14 insertions, 4 deletions

diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala
index 0a50eb8ecc..5c9665cdc7 100644
--- a/src/reflect/scala/reflect/internal/Types.scala
+++ b/src/reflect/scala/reflect/internal/Types.scala
@@ -107,6 +107,18 @@ trait Types
 
   protected val enableTypeVarExperimentals = settings.Xexperimental.value
 
+  /** Caching the most recent map has a 75-90% hit rate. */
+  private object substTypeMapCache {
+    private[this] var cached: SubstTypeMap = new SubstTypeMap(Nil, Nil)
+
+    def apply(from: List[Symbol], to: List[Type]): SubstTypeMap = {
+      if ((cached.from ne from) || (cached.to ne to))
+        cached = new SubstTypeMap(from, to)
+
+      cached
+    }
+  }
+
   /** The current skolemization level, needed for the algorithms
    *  in isSameType, isSubType that do constraint solving under a prefix.
    */
@@ -698,8 +710,7 @@ trait Types
      *  symbols `from` in this type.
      */
     def subst(from: List[Symbol], to: List[Type]): Type =
-      if (from.isEmpty) this
-      else new SubstTypeMap(from, to) apply this
+      if (from.isEmpty) this else substTypeMapCache(from, to)(this)
 
     /** Substitute symbols `to` for occurrences of symbols `from` in this type.
      *
diff --git a/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala b/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala
index c35825dcee..bebc419c7c 100644
--- a/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala
+++ b/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala
@@ -794,8 +794,7 @@ private[internal] trait TypeMaps {
   }
 
   /** A map to implement the `subst` method. */
-  class SubstTypeMap(from: List[Symbol], to: List[Type])
-    extends SubstMap(from, to) {
+  class SubstTypeMap(val from: List[Symbol], val to: List[Type]) extends SubstMap(from, to) {
     protected def toType(fromtp: Type, tp: Type) = tp
 
     override def mapOver(tree: Tree, giveup: () => Nothing): Tree = {