2 files changed, 19 insertions, 15 deletions
diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala
index bbd9df05d2..49554d6d0f 100644
--- a/src/reflect/scala/reflect/internal/Trees.scala
+++ b/src/reflect/scala/reflect/internal/Trees.scala
@@ -1617,21 +1617,9 @@ trait Trees extends api.Trees {
     }
     def apply[T <: Tree](tree: T): T = {
       val tree1 = transform(tree)
-      invalidateSingleTypeCaches(tree1)
+      invalidateTreeTpeCaches(tree1, mutatedSymbols)
       tree1.asInstanceOf[T]
     }
-    private def invalidateSingleTypeCaches(tree: Tree): Unit = {
-      if (mutatedSymbols.nonEmpty)
-        for (t <- tree if t.tpe != null)
-          for (tp <- t.tpe) {
-            tp match {
-              case s: SingleType if mutatedSymbols contains s.sym =>
-                s.underlyingPeriod = NoPeriod
-                s.underlyingCache = NoType
-              case _ =>
-            }
-          }
-    }
     override def toString() = "TreeSymSubstituter/" + substituterString("Symbol", "Symbol", from, to)
   }
 
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala
index 2ae95c98e5..1ac772fb70 100644
--- a/src/reflect/scala/reflect/internal/Types.scala
+++ b/src/reflect/scala/reflect/internal/Types.scala
@@ -1989,8 +1989,8 @@ trait Types
      * several times. Hence, no need to protected with synchronized in a multi-threaded
      * usage scenario.
      */
-    private var relativeInfoCache: Type = _
-    private var relativeInfoPeriod: Period = NoPeriod
+    private[Types] var relativeInfoCache: Type = _
+    private[Types] var relativeInfoPeriod: Period = NoPeriod
 
     private[Types] def relativeInfo = /*trace(s"relativeInfo(${safeToString}})")*/{
       if (relativeInfoPeriod != currentPeriod) {
@@ -4569,6 +4569,22 @@ trait Types
     if (!phase.erasedTypes && tp.typeSymbol == ObjectClass) AnyTpe
     else tp
 
+  def invalidateTreeTpeCaches(tree: Tree, updatedSyms: List[Symbol]) = if (updatedSyms.nonEmpty)
+    for (t <- tree if t.tpe != null)
+      for (tp <- t.tpe) {
+        invalidateCaches(tp, updatedSyms)
+      }
+
+  def invalidateCaches(t: Type, updatedSyms: List[Symbol]) = t match {
+    case st: SingleType if updatedSyms.contains(st.sym) =>
+      st.underlyingCache = NoType
+      st.underlyingPeriod = NoPeriod
+    case tr: NonClassTypeRef if updatedSyms.contains(tr.sym) =>
+      tr.relativeInfoCache = NoType
+      tr.relativeInfoPeriod = NoPeriod
+    case _ =>
+  }
+
   val shorthands = Set(
     "scala.collection.immutable.List",
     "scala.collection.immutable.Nil",