Revert "Parameterize Constraint with constrained VarRef"

This reverts commit 4845d42.

Author: Aleksander Boruch-Gruszecki

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

@@ -5,6 +5,11 @@ package core
 import Types._, Contexts._
 import printing.Showable
 
+object Constraint {
+  type VarRef = TypeVarRef
+  type Binder = TypeVarRefBinder
+}
+
 /** Constraint over undetermined type parameters. Constraints are built
  *  over values of the following types:
  *
@@ -13,17 +18,19 @@ import printing.Showable
  *   - TypeVar       Every constrained parameter might be associated with a TypeVar
  *                   that has the TypeParamRef as origin.
  */
-abstract class Constraint[VarRef <: TypeVarRef, RefBinder <: TypeVarRefBinder] extends Showable {
-  type This <: Constraint[VarRef, RefBinder]
+abstract class Constraint extends Showable {
+  import Constraint._
+
+  type This <: Constraint
 
   /** Does the constraint's domain contain the type parameters of `pt`? */
-  def contains(pt: RefBinder): Boolean
+  def contains(pt: Binder): Boolean
 
   /** Does the constraint's domain contain the type parameter `param`? */
   def contains(param: VarRef): Boolean
 
   /** Does this constraint contain the type variable `tvar` and is it uninstantiated? */
-  def contains(tvar: TypeVarHandle[VarRef]): Boolean
+  def contains(tvar: TypeVar): Boolean
 
   /** The constraint entry for given type parameter `param`, or NoType if `param` is not part of
    *  the constraint domain. Note: Low level, implementation dependent.
@@ -73,7 +80,7 @@ abstract class Constraint[VarRef <: TypeVarRef, RefBinder <: TypeVarRefBinder] e
    *                 satisfiability but will solved to give instances of
    *                 type variables.
    */
-  def add(poly: RefBinder, tvars: List[TypeVarHandle[VarRef]])(implicit ctx: Context): This
+  def add(poly: Binder, tvars: List[TypeVar])(implicit ctx: Context): This
 
   /** A new constraint which is derived from this constraint by updating
    *  the entry for parameter `param` to `tp`.
@@ -109,13 +116,13 @@ abstract class Constraint[VarRef <: TypeVarRef, RefBinder <: TypeVarRefBinder] e
    *  all type parameters of the entry are associated with type variables
    *  which have their `inst` fields set.
    */
-  def isRemovable(pt: RefBinder): Boolean
+  def isRemovable(pt: Binder): Boolean
 
   /** A new constraint with all entries coming from `pt` removed. */
-  def remove(pt: RefBinder)(implicit ctx: Context): This
+  def remove(pt: Binder)(implicit ctx: Context): This
 
   /** The type lambdas constrained by this constraint */
-  def domainLambdas: List[RefBinder]
+  def domainLambdas: List[Binder]
 
   /** The type lambda parameters constrained by this constraint */
   def domainParams: List[VarRef]
@@ -136,7 +143,7 @@ abstract class Constraint[VarRef <: TypeVarRef, RefBinder <: TypeVarRefBinder] e
    *                           returning an approximate constraint, instead of
    *                           failing with an exception
    */
-  def & (other: Constraint[VarRef, RefBinder], otherHasErrors: Boolean)(implicit ctx: Context): Constraint[VarRef, RefBinder]
+  def & (other: Constraint, otherHasErrors: Boolean)(implicit ctx: Context): Constraint
 
   /** Check that no constrained parameter contains itself as a bound */
   def checkNonCyclic()(implicit ctx: Context): Unit

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

@@ -18,22 +18,19 @@ import config.Printers.{constr, typr}
  * By comparison: Constraint handlers are parts of type comparers and can use their functionality.
  * Constraint handlers update the current constraint as a side effect.
  */
-trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <: TypeVarRefBinder.Of[VarRef, RefBinder]] {
-  protected final type OwnConstraint = Constraint[VarRef, RefBinder]
+trait ConstraintHandling {
+  import Constraint._
 
-  protected def isVarRef(r: Type): Boolean = r.isInstanceOf[TypeVarRef]
-  protected def isRefBinder(r: Type): Boolean = r.isInstanceOf[TypeVarRefBinder]
-
-  protected def constr_println(msg: => String): Unit = constr.println(msg)
-  protected def typr_println(msg: => String): Unit = typr.println(msg)
+  def constr_println(msg: => String): Unit = constr.println(msg)
+  def typr_println(msg: => String): Unit = typr.println(msg)
 
   implicit def ctx: Context
 
   protected def isSubType(tp1: Type, tp2: Type): Boolean
   protected def isSameType(tp1: Type, tp2: Type): Boolean
 
-  protected def constraint: OwnConstraint
-  protected def constraint_=(c: OwnConstraint): Unit
+  protected def constraint: Constraint
+  protected def constraint_=(c: Constraint): Unit
 
   private[this] var addConstraintInvocations = 0
 
@@ -62,10 +59,9 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
     *  is done only in a temporary way for contexts that may be retracted
     *  without also retracting the type var as a whole.
     */
-  def instType(tvar: TypeVarHandle[VarRef]): Type = constraint.entry(tvar.origin) match {
+  def instType(tvar: TypeVar): Type = constraint.entry(tvar.origin) match {
     case _: TypeBounds => NoType
-    case tp_ if isVarRef(tp_) =>
-      val tp = tp_.asInstanceOf[VarRef]
+    case tp: VarRef =>
       var tvar1 = constraint.typeVarOfParam(tp)
       if (tvar1.exists) tvar1 else tp
     case tp => tp
@@ -288,9 +284,9 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
       case tp: SingletonType => true
       case AndType(tp1, tp2) => isMultiSingleton(tp1) | isMultiSingleton(tp2)
       case OrType(tp1, tp2) => isMultiSingleton(tp1) & isMultiSingleton(tp2)
-      case tp_ if isVarRef(tp_) => isMultiSingleton(bounds(tp_.asInstanceOf[VarRef]).hi)
-      case tp: TypeRef => isMultiSingleton(tp.info.hiBound)
+      case tp: TypeRef if !constraint.contains(tp : VarRef) => isMultiSingleton(tp.info.hiBound)
       case tp: TypeVar => isMultiSingleton(tp.underlying)
+      case tp: VarRef => isMultiSingleton(bounds(tp).hi)
       case _ => false
     }
     def isOrType(tp: Type): Boolean = tp.dealias match {
@@ -331,7 +327,7 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
    *  Both `c1` and `c2` are required to derive from constraint `pre`, possibly
    *  narrowing it with further bounds.
    */
-  protected final def subsumes(c1: OwnConstraint, c2: OwnConstraint, pre: OwnConstraint): Boolean =
+  protected final def subsumes(c1: Constraint, c2: Constraint, pre: Constraint): Boolean =
     if (c2 eq pre) true
     else if (c1 eq pre) false
     else {
@@ -359,7 +355,7 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
    *  and propagate all bounds.
    *  @param tvars   See Constraint#add
    */
-  def addToConstraint(tl: RefBinder, tvars: List[TypeVarHandle[VarRef]]): Boolean =
+  def addToConstraint(tl: Binder, tvars: List[TypeVar]): Boolean =
     checkPropagated(i"initialized $tl") {
       constraint = constraint.add(tl, tvars)
       tl.boundRefs.forall { param =>
@@ -431,7 +427,7 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
         }
         else tp
 
-      def addParamBound(bound: VarRef) =
+      def addParamBound(bound: TypeParamRef) =
         constraint.entry(param) match {
           case _: TypeBounds =>
             if (fromBelow) addLess(bound, param) else addLess(param, bound)
@@ -484,10 +480,9 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
           val p2 = prune(bound.tp2)
           if (p1.exists && p2.exists) bound.derivedOrType(p1, p2)
           else NoType
-        case bound: TypeVar if constraint contains bound.origin.asInstanceOf[VarRef] =>
+        case bound: TypeVar if constraint contains bound.origin =>
           prune(bound.underlying)
-        case bound_ : TypeParamRef =>
-          val bound = bound_.asInstanceOf[VarRef]
+        case bound: TypeParamRef =>
           constraint.entry(bound) match {
             case NoType => pruneLambdaParams(bound)
             case _: TypeBounds =>
@@ -502,8 +497,7 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
       }
 
       try bound match {
-        case bound_ : TypeParamRef if constraint contains bound_.asInstanceOf[VarRef] =>
-          val bound = bound_.asInstanceOf[VarRef]
+        case bound: TypeParamRef if constraint contains bound =>
           addParamBound(bound)
         case _ =>
           val pbound = prune(bound)
@@ -515,7 +509,7 @@ trait ConstraintHandling[VarRef <: TypeVarRef.Of[VarRef, RefBinder], RefBinder <
   }
 
   /** Instantiate `param` to `tp` if the constraint stays satisfiable */
-  protected def tryInstantiate(param: VarRef, tp: Type): Boolean = {
+  protected def tryInstantiate(param: TypeParamRef, tp: Type): Boolean = {
     val saved = constraint
     constraint =
       if (addConstraint(param, tp, fromBelow = true) &&

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

@@ -6,8 +6,8 @@ import config.Printers.{default, typr}
 
 trait ConstraintRunInfo { self: Run =>
   private[this] var maxSize = 0
-  private[this] var maxConstraint: Constraint[_, _] = _
-  def recordConstraintSize(c: Constraint[_, _], size: Int): Unit =
+  private[this] var maxConstraint: Constraint = _
+  def recordConstraintSize(c: Constraint, size: Int): Unit =
     if (size > maxSize) {
       maxSize = size
       maxConstraint = c

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

@@ -717,21 +717,12 @@ object Contexts {
     def derived: GADTMap
   }
 
-  case class TvHandle(origin: TypeVarRef) extends Type with TypeVarHandle[TypeVarRef] {
-    override def computeHash(bs: Hashable.Binders): Int = 0
-    override def hash: Int = 0
-  }
-
   final class SmartGADTMap(
-    private[this] var myConstraint: Constraint[TypeVarRef, TypeVarRefBinder] =
-      new OrderingConstraint[TypeVarRef, TypeVarRefBinder](SimpleIdentityMap.Empty, SimpleIdentityMap.Empty, SimpleIdentityMap.Empty),
-    private[this] var mapping: SimpleIdentityMap[Symbol, TvHandle] = SimpleIdentityMap.Empty,
-  ) extends GADTMap with ConstraintHandling[TypeVarRef, TypeVarRefBinder] {
+    private[this] var myConstraint: Constraint = new OrderingConstraint(SimpleIdentityMap.Empty, SimpleIdentityMap.Empty, SimpleIdentityMap.Empty),
+    private[this] var mapping: SimpleIdentityMap[Symbol, TypeVar] = SimpleIdentityMap.Empty,
+  ) extends GADTMap with ConstraintHandling {
     import dotty.tools.dotc.config.Printers.gadts
 
-    override def isVarRef(r: Type): Boolean = r.isInstanceOf[TypeParamRef] ||
-      (r.isInstanceOf[TypeRef] && mapping.contains(r.typeSymbol(ctx)))
-
     override def debugBoundsDescription(implicit ctx: Context): String = {
       val sb = new mutable.StringBuilder
       sb ++= constraint.show
@@ -751,18 +742,17 @@ object Contexts {
       try op finally myCtx = savedCtx
     }
 
-    override protected def constraint: OwnConstraint = myConstraint
-    override protected def constraint_=(c: OwnConstraint) = myConstraint = c
+    override protected def constraint = myConstraint
+    override protected def constraint_=(c: Constraint) = myConstraint = c
 
     override def isSubType(tp1: Type, tp2: Type): Boolean = ctx.typeComparer.isSubType(tp1, tp2)
     override def isSameType(tp1: Type, tp2: Type): Boolean = ctx.typeComparer.isSameType(tp1, tp2)
 
-    private[this] def tvar(sym: Symbol)(implicit ctx: Context): TvHandle = inCtx(ctx) {
+    private[this] def tvar(sym: Symbol)(implicit ctx: Context): TypeVar = inCtx(ctx) {
       val res = mapping(sym) match {
-        case tv: TvHandle => tv
+        case tv: TypeVar => tv
         case null =>
-          // val res = new TypeVar(sym.typeRef, creatorState = null)
-          val res = TvHandle(sym.typeRef)
+          val res = new TypeVar(sym.typeRef, creatorState = null)
           gadts.println(i"GADTMap: created tvar $sym -> $res")
           constraint = constraint.add(res.origin.binder, res :: Nil)
           mapping = mapping.updated(sym, res)
@@ -783,7 +773,7 @@ object Contexts {
       }
 
       @annotation.tailrec def firstUninst(tp: Type): Type = tp match {
-        case tv: TypeVarHandle[_] =>
+        case tv: TypeVar =>
           val inst = _instType(tv.origin)
           if (inst.exists) firstUninst(inst) else tv
         case ref: TypeVarRef =>
@@ -815,15 +805,15 @@ object Contexts {
       }
 
       val symRef: TypeVarRef = firstUninst(tvar(sym)) match {
-        case tv: TypeVarHandle[_] => tv.origin
+        case tv: TypeVar => tv.origin
         case inst =>
           gadts.println(i"instantiated: $sym -> $inst")
           return cautiousSubtype(inst, bound, isSubtype = isUpper, allowNarrowing = true)
       }
 
       def doAddBound(bound: Type): Boolean = {
         val realBound = firstUninst(bound) match {
-          case tv: TypeVarHandle[_] => tv.origin
+          case tv: TypeVar => tv.origin
           case tp => tp
         }
 
@@ -848,7 +838,7 @@ object Contexts {
 
       val tvarBound = bound
       val res = tvarBound match {
-        case boundTvar: TypeVarHandle[_] =>
+        case boundTvar: TypeVar =>
           doAddBound(boundTvar)
         case tp => doAddBound(tp)
       }
@@ -874,6 +864,16 @@ object Contexts {
       this.myConstraint,
       this.mapping
     )
+
+    private final class TypeVarInsertingMap extends TypeMap {
+      override def apply(tp: Type): Type = tp match {
+        case tp: TypeRef =>
+          val sym = tp.typeSymbol
+          if (contains(sym)) tvar(sym) else tp
+        case _ =>
+          mapOver(tp)
+      }
+    }
   }
 
   @sharable object EmptyGADTMap extends GADTMap {