Merge pull request #13779 from dotty-staging/constrain-finalResultType-2

Fix improper usage of `constrained` breaking type inference

compiler/src/dotty/tools/dotc/typer/Applications.scala

@@ -411,7 +411,7 @@ trait Applications extends Compatibility {
      */
     @threadUnsafe lazy val methType: Type = liftedFunType.widen match {
       case funType: MethodType => funType
-      case funType: PolyType => constrained(funType).resultType
+      case funType: PolyType => instantiateWithTypeVars(funType)
       case tp => tp //was: funType
     }
 
@@ -1562,7 +1562,7 @@ trait Applications extends Compatibility {
             case tp2: MethodType => true // (3a)
             case tp2: PolyType if tp2.resultType.isInstanceOf[MethodType] => true // (3a)
             case tp2: PolyType => // (3b)
-              explore(isAsSpecificValueType(tp1, constrained(tp2).resultType))
+              explore(isAsSpecificValueType(tp1, instantiateWithTypeVars(tp2)))
             case _ => // 3b)
               isAsSpecificValueType(tp1, tp2)
     }
@@ -1729,7 +1729,7 @@ trait Applications extends Compatibility {
       resultType.revealIgnored match {
         case resultType: ValueType =>
           altType.widen match {
-            case tp: PolyType => resultConforms(altSym, constrained(tp).resultType, resultType)
+            case tp: PolyType => resultConforms(altSym, instantiateWithTypeVars(tp), resultType)
             case tp: MethodType => constrainResult(altSym, tp.resultType, resultType)
             case _ => true
           }

compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala

@@ -659,6 +659,11 @@ object ProtoTypes {
   def constrained(tl: TypeLambda)(using Context): TypeLambda =
     constrained(tl, EmptyTree)._1
 
+  /** Instantiate `tl` with fresh type variables added to the constraint. */
+  def instantiateWithTypeVars(tl: TypeLambda)(using Context): Type =
+    val targs = constrained(tl, ast.tpd.EmptyTree, alwaysAddTypeVars = true)._2
+    tl.instantiate(targs.tpes)
+
   /** A new type variable with given bounds for its origin.
    *  @param  represents  If exists, the TermParamRef that the TypeVar represents
    *                      in the substitution generated by `resultTypeApprox`
@@ -707,7 +712,7 @@ object ProtoTypes {
     else mt.resultType
 
   /** The normalized form of a type
-   *   - unwraps polymorphic types, tracking their parameters in the current constraint
+   *   - instantiate polymorphic types with fresh type variables in the current constraint
    *   - skips implicit parameters of methods and functions;
    *     if result type depends on implicit parameter, replace with wildcard.
    *   - converts non-dependent method types to the corresponding function types
@@ -726,7 +731,7 @@ object ProtoTypes {
     Stats.record("normalize")
     tp.widenSingleton match {
       case poly: PolyType =>
-        normalize(constrained(poly).resultType, pt)
+        normalize(instantiateWithTypeVars(poly), pt)
       case mt: MethodType =>
         if (mt.isImplicitMethod) normalize(resultTypeApprox(mt, wildcardOnly = true), pt)
         else if (mt.isResultDependent) tp

compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala

@@ -7,6 +7,7 @@ import dotty.tools.dotc.core.Contexts.{*, given}
 import dotty.tools.dotc.core.Decorators.{*, given}
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
+import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.typer.ProtoTypes.constrained
 
 import org.junit.Test
@@ -18,8 +19,8 @@ class ConstraintsTest:
   @Test def mergeParamsTransitivity: Unit =
     inCompilerContext(TestConfiguration.basicClasspath,
         scalaSources = "trait A { def foo[S, T, R]: Any  }") {
-      val tp = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda])
-      val List(s, t, r) = tp.paramRefs
+      val tvars = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda], EmptyTree, alwaysAddTypeVars = true)._2
+      val List(s, t, r) = tvars.tpes
 
       val innerCtx = ctx.fresh.setExploreTyperState()
       inContext(innerCtx) {
@@ -37,8 +38,8 @@ class ConstraintsTest:
   @Test def mergeBoundsTransitivity: Unit =
     inCompilerContext(TestConfiguration.basicClasspath,
         scalaSources = "trait A { def foo[S, T]: Any  }") {
-      val tp = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda])
-      val List(s, t) = tp.paramRefs
+      val tvars = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda], EmptyTree, alwaysAddTypeVars = true)._2
+      val List(s, t) = tvars.tpes
 
       val innerCtx = ctx.fresh.setExploreTyperState()
       inContext(innerCtx) {

tests/pos/stm.scala

@@ -0,0 +1,10 @@
+class Inv[X]
+class Ref[X]
+object Ref {
+  def apply(i: Inv[Int], x: Int): Ref[Int] = ???
+  def apply[Y](i: Inv[Y], x: Y): Ref[Y] = ???
+}
+
+class A {
+  val ref: Ref[List[AnyRef]] = Ref(new Inv[List[AnyRef]], List.empty)
+}

tests/pos/t0851.scala

@@ -1,9 +1,8 @@
 package test
 
 object test1 {
-  case class Foo[T,T2](f : (T,T2) => String) extends (((T,T2)) => String){
+  case class Foo[T,T2](f : (T,T2) => String) {
     def apply(t : T) = (s:T2) => f(t,s)
-    def apply(p : (T,T2)) = f(p._1,p._2)
   }
   implicit def g[T](f : (T,String) => String): Foo[T, String] = Foo(f)
   def main(args : Array[String]) : Unit = {

tests/pos/t2913.scala

@@ -33,9 +33,8 @@ object TestNoAutoTupling {
 
 // t0851 is essentially the same:
 object test1 {
-  case class Foo[T,T2](f : (T,T2) => String) extends (((T,T2)) => String){
+  case class Foo[T,T2](f : (T,T2) => String) {
     def apply(t : T) = (s:T2) => f(t,s)
-    def apply(p : (T,T2)) = f(p._1,p._2)
   }
   implicit def g[T](f : (T,String) => String): test1.Foo[T,String] = Foo(f)
   def main(args : Array[String]) : Unit = {