Three fixes wrt handlings of package objects

 1. Invalidate packageObj cache when entering a package object
 2. Prefer package object members over same-named package members
    unless we are in the scala package
 3. Exclude package objects from no-double-bindings checks, since
    package objects may now be visited before indexing them.

1 files changed, 16 insertions, 7 deletions

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
index 8ae3aa7ad..e7130ee2f 100644
--- a/compiler/src/dotty/tools/dotc/core/Types.scala
+++ b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -1504,20 +1504,29 @@ object Types {
         case _ => NoType
       }
       assert(
-        (lastSymbol eq sym) ||
-        (lastSymbol eq null) || {
+        (lastSymbol eq sym)
+        ||
+        (lastSymbol eq null)
+        || {
           val lastDefRunId = lastDenotation match {
             case d: SymDenotation => d.validFor.runId
             case _ => lastSymbol.defRunId
           }
           (lastDefRunId != sym.defRunId) ||
           (lastDefRunId == NoRunId)
-        } ||
-        (lastSymbol.infoOrCompleter.isInstanceOf[ErrorType] ||
+        }
+        ||
+        lastSymbol.infoOrCompleter.isInstanceOf[ErrorType]
+        ||
+        sym.isPackageObject // package objects can be visited before we get around to index them
+        ||
         sym.owner != lastSymbol.owner &&
-        (sym.owner.derivesFrom(lastSymbol.owner) ||
-         selfTypeOf(sym).derivesFrom(lastSymbol.owner) ||
-         selfTypeOf(lastSymbol).derivesFrom(sym.owner))),
+          (sym.owner.derivesFrom(lastSymbol.owner)
+           ||
+           selfTypeOf(sym).derivesFrom(lastSymbol.owner)
+           ||
+           selfTypeOf(lastSymbol).derivesFrom(sym.owner)
+          ),
         i"""data race? overwriting symbol of type $this,
            |long form = $toString of class $getClass,
            |last sym id = ${lastSymbol.id}, new sym id = ${sym.id},