Fix rebase breakage

Author: odersky

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -213,7 +213,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     ta.assignType(untpd.TypeDef(sym.name, TypeTree(sym.info)), sym)
 
   def ClassDef(cls: ClassSymbol, constr: DefDef, body: List[Tree], superArgs: List[Tree] = Nil)(implicit ctx: Context): TypeDef = {
-    val firstParentRef :: otherParentRefs = cls.info.parentRefs
+    val firstParentRef :: otherParentRefs = cls.info.parentRefs // @!!! adapt
     val firstParent = cls.appliedRef.baseTypeWithArgs(firstParentRef.symbol)
     val superRef =
       if (cls is Trait) TypeTree(firstParent)

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

@@ -39,7 +39,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
         else pre match {
           case pre: SuperType => toPrefix(pre.thistpe, cls, thiscls)
           case _ =>
-            if (thiscls.derivesFrom(cls) && pre.baseTypeRef(thiscls).exists)
+            if (thiscls.derivesFrom(cls) && pre.baseType(thiscls).exists)
               if (variance <= 0 && !isLegalPrefix(pre)) range(pre.bottomType, pre)
               else pre
             else if ((pre.termSymbol is Package) && !(thiscls is Package))
@@ -60,7 +60,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
             if (tparams.head.eq(tparam))
               return args.head match {
                 case bounds: TypeBounds =>
-                  val v = currentVariance
+                  val v = variance
                   if (v > 0) bounds.hi
                   else if (v < 0) bounds.lo
                   else TypeArgRef(pre, cls.typeRef, idx)
@@ -298,7 +298,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
    *  all (possibly applied) references to classes.
    */
   def normalizeToClassRefs(parents: List[Type], cls: ClassSymbol, decls: Scope): List[Type] = {
-    if (Config.newScheme) return parents.mapConserve(_.dealias)
+    if (Config.newScheme) return parents.mapConserve(_.dealias) // !@@@ track and eliminate usages?
     // println(s"normalizing $parents of $cls in ${cls.owner}") // !!! DEBUG
 
     // A map consolidating all refinements arising from parent type parameters

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

@@ -4044,12 +4044,12 @@ object Types {
   abstract class DeepTypeMap(implicit ctx: Context) extends TypeMap {
     override def mapClassInfo(tp: ClassInfo) = {
       val prefix1 = this(tp.prefix)
-      val parentRefs1 = (tp.parentRefs mapConserve this).asInstanceOf[List[TypeRef]]
+      val parents1 = tp.parentsNEW mapConserve this
       val selfInfo1 = tp.selfInfo match {
         case selfInfo: Type => this(selfInfo)
         case selfInfo => selfInfo
       }
-      tp.derivedClassInfo(prefix1, parentRefs1, tp.decls, selfInfo1)
+      tp.derivedClassInfo(prefix1, parents1, tp.decls, selfInfo1)
     }
   }
 
@@ -4280,7 +4280,7 @@ object Types {
       if (prefix.exists) tp.derivedTypeArgRef(prefix)
       else {
         val paramBounds = tp.underlying
-        approx(paramBounds.loBound, paramBounds.hiBound)
+        range(paramBounds.loBound, paramBounds.hiBound)
       }
 
     override protected def derivedAnnotatedType(tp: AnnotatedType, underlying: Type, annot: Annotation) =