Cleanups

Author: odersky

compiler/src/dotty/tools/dotc/core/TypeOps.scala

@@ -57,10 +57,9 @@ object TypeOps:
 
   /** The TypeMap handling the asSeenFrom */
   class AsSeenFromMap(pre: Type, cls: Symbol)(using Context) extends ApproximatingTypeMap, IdempotentCaptRefMap {
-    /** Set to true when the result of `apply` was approximated to avoid an unstable prefix. */
-    private var approximated: Boolean = false
 
     /** The number of range approximations in invariant or contravariant positions
+     *  performed by this TypeMap.
      *   - Incremented each time we produce a range.
      *   - Decremented each time we drop a prefix range by forwarding to a type alias
      *     or singleton type.
@@ -83,22 +82,8 @@ object TypeOps:
           case _ =>
             if (thiscls.derivesFrom(cls) && pre.baseType(thiscls).exists)
               if (variance <= 0 && !isLegalPrefix(pre))
-                if true then
-                  approxCount += 1
-                  range(defn.NothingType, pre)
-                else
-                  if (variance < 0) {
-                    approximated = true
-                    defn.NothingType
-                  }
-                  else
-                    // Don't set the `approximated` flag yet: if this is a prefix
-                    // of a path, we might be able to dealias the path instead
-                    // (this is handled in `ApproximatingTypeMap`). If dealiasing
-                    // is not possible, then `expandBounds` will end up being
-                    // called which we override to set the `approximated` flag.
-                    range(defn.NothingType, pre)
-
+                approxCount += 1
+                range(defn.NothingType, pre)
               else pre
             else if (pre.termSymbol.is(Package) && !thiscls.is(Package))
               toPrefix(pre.select(nme.PACKAGE), cls, thiscls)
@@ -131,11 +116,6 @@ object TypeOps:
       // derived infos have already been subjected to asSeenFrom, hence to need to apply the map again.
       tp
 
-    //override protected def expandBounds(tp: TypeBounds): Type = {
-    //  approximated = true
-    //  super.expandBounds(tp)
-    //}
-
     override protected def useAlternate(tp: Type): Type =
       assert(approxCount > 0)
       approxCount -= 1

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -5819,15 +5819,11 @@ object Types {
       tp.argForParam(pre) match {
         case arg @ TypeRef(pre, _) if pre.isArgPrefixOf(arg.symbol) =>
           arg.info match {
-            case argInfo: TypeBounds =>
-              expandBounds(argInfo)
-            case argInfo =>
-              useAlternate(arg)
+            case argInfo: TypeBounds => expandBounds(argInfo)
+            case argInfo => useAlternate(arg)
           }
-        case arg: TypeBounds =>
-          expandBounds(arg)
-        case arg =>
-          useAlternate(arg)
+        case arg: TypeBounds => expandBounds(arg)
+        case arg => useAlternate(arg)
       }
 
     /** Derived selection.