Simplify methods implemented in #436

1 files changed, 6 insertions, 2 deletions

diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala
index 0ee633861..9889bc89c 100644
--- a/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -1286,7 +1286,11 @@ object SymDenotations {
     def enter(sym: Symbol, scope: Scope = EmptyScope)(implicit ctx: Context): Unit = {
       val mscope = scope match {
         case scope: MutableScope =>
-          assert(this.nextInRun == this) // we are not going to bring this symbol into future
+          // if enter gets a scope as an argument,
+          // than this is a scope that will eventually become decls of this symbol.
+          // And this should only happen if this is first time the scope of symbol
+          // is computed, ie symbol yet has no future.
+          assert(this.nextInRun == this)
           scope
         case _ => unforcedDecls.openForMutations
       }
@@ -1300,7 +1304,7 @@ object SymDenotations {
       }
       enterNoReplace(sym, mscope)
       val nxt = this.nextInRun
-      if((nxt ne this) && (nxt.validFor.code > this.validFor.code)) {
+      if (nxt.validFor.code > this.validFor.code) {
         this.nextInRun.asSymDenotation.asClass.enter(sym)
       }
     }