From f24295a7448fc67b399f292f05d89e4b216d9749 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Wed, 25 Dec 2013 19:08:16 +0100
Subject: Fix for caching of denotsNamed.

The problematic scenario is when a member is looked up between the point where a class is provisionally completed with Nil as parents and a class is finally completed. In that case we might miss a parent ref, which should then not entered in the cache.
---
 src/dotty/tools/dotc/core/SymDenotations.scala | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/dotty/tools/dotc')

diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala
index 086a79ce6..825dd5544 100644
--- a/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -178,7 +178,7 @@ object SymDenotations {
       case Nil => Nil
     }
 
-    /** The denotation is completed: all attributes are fully defined */
+    /** The denotation is completed: info is not a lazy type and attributes have defined values */
     final def isCompleted: Boolean = !myInfo.isInstanceOf[LazyType]
 
     /** The denotation is in train of being completed */
@@ -753,6 +753,13 @@ object SymDenotations {
       myTypeParams
     }
 
+    /** The denotation is fully completed: all attributes are fully defined.
+     *  ClassDenotations compiled from source are first completed, then fully completed.
+     *  @see Namer#ClassCompleter
+     */
+    private def isFullyCompleted(implicit ctx: Context): Boolean =
+      isCompleted && classInfo.myClassParents.nonEmpty
+
     /** A key to verify that all caches influenced by parent classes are valid */
     private var parentDenots: List[Denotation] = null
 
@@ -763,7 +770,7 @@ object SymDenotations {
      */
     def classParents(implicit ctx: Context) = {
       val ps = classInfo.myClassParents
-      if (parentDenots == null) parentDenots = ps map (_.denot)
+      if (parentDenots == null && ps.nonEmpty) parentDenots = ps map (_.denot)
       ps
     }
 
@@ -952,7 +959,7 @@ object SymDenotations {
         var denots: PreDenotation = memberCache lookup name
         if (denots == null) {
           denots = computeNPMembersNamed(name)
-          memberCache enter (name, denots)
+          if (isFullyCompleted) memberCache.enter(name, denots)
         } else if (Config.checkCacheMembersNamed) {
           val denots1 = computeNPMembersNamed(name)
           assert(denots.exists == denots1.exists, s"cache inconsistency: cached: $denots, computed $denots1, name = $name, owner = $this")
-- 
cgit v1.2.3