Use all available context info for healing ambiguous implicits

odersky · michelou · commit 5d28c9f6eb07 · 2021-02-05T13:13:57.000+01:00
When retrying after an ambiguous implicit, we now make use of all the information in the prototype, including ignored parts. We also try to match formal parameters with actually given arguments. Fixes scala#11243 Fixes scala#5773, which previously was closed with a more detailed error message.
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -1652,6 +1652,11 @@ object Types {
      */
     def deepenProto(using Context): Type = this
 
+    /** If this is a prototype with some ignored component, reveal it, and
+     *  deepen the result transitively. Otherwise the type itself.
+     */
+    def deepenProtoTrans(using Context): Type = this
+
     /** If this is an ignored proto type, its underlying type, otherwise the type itself */
     def revealIgnored: Type = this
 
@@ -3436,7 +3441,7 @@ object Types {
           case tp: TermRef => applyPrefix(tp)
           case tp: AppliedType => tp.fold(status, compute(_, _, theAcc))
           case tp: TypeVar if !tp.isInstantiated => combine(status, Provisional)
-          case TermParamRef(`thisLambdaType`, _) => TrueDeps
+          case tp: TermParamRef if tp.binder eq thisLambdaType => TrueDeps
           case _: ThisType | _: BoundType | NoPrefix => status
           case _ =>
             (if theAcc != null then theAcc else DepAcc()).foldOver(status, tp)
diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
@@ -49,25 +49,34 @@ object ProtoTypes {
     /** Test compatibility after normalization.
      *  Do this in a fresh typerstate unless `keepConstraint` is true.
      */
-    def normalizedCompatible(tp: Type, pt: Type, keepConstraint: Boolean)(using Context): Boolean = {
-      def testCompat(using Context): Boolean = {
+    def normalizedCompatible(tp: Type, pt: Type, keepConstraint: Boolean)(using Context): Boolean =
+
+      def testCompat(using Context): Boolean =
         val normTp = normalize(tp, pt)
         isCompatible(normTp, pt) || pt.isRef(defn.UnitClass) && normTp.isParameterless
-      }
-      if (keepConstraint)
-        tp.widenSingleton match {
+
+      if keepConstraint || ctx.mode.is(Mode.ConstrainResultDeep) then
+        tp.widenSingleton match
           case poly: PolyType =>
-            // We can't keep the constraint in this case, since we have to add type parameters
-            // to it, but there's no place to associate them with type variables.
-            // So we'd get a "inconsistent: no typevars were added to committable constraint"
-            // assertion failure in `constrained`. To do better, we'd have to change the
-            // constraint handling architecture so that some type parameters are committable
-            // and others are not. But that's a whole different ballgame.
-            normalizedCompatible(tp, pt, keepConstraint = false)
+            val newctx = ctx.fresh.setNewTyperState()
+            val result = testCompat(using newctx)
+            typr.println(
+                i"""normalizedCompatible for $poly, $pt = $result
+                   |constraint was: ${ctx.typerState.constraint}
+                   |constraint now: ${newctx.typerState.constraint}""")
+            val existingVars = ctx.typerState.uninstVars.toSet
+            if result
+                && (ctx.typerState.constraint ne newctx.typerState.constraint)
+                && newctx.typerState.uninstVars.forall(existingVars.contains)
+            then newctx.typerState.commit()
+              // If the new constrait contains fresh type variables we cannot keep it,
+              // since those type variables are not instantiated anywhere in the source.
+              // See pos/i6682a.scala for a test case. See pos/11243.scala and pos/i5773b.scala
+              // for tests where it matters that we keep the constraint otherwise.
+            result
           case _ => testCompat
-        }
       else explore(testCompat)
-    }
+    end normalizedCompatible
 
     private def disregardProto(pt: Type)(using Context): Boolean =
       pt.dealias.isRef(defn.UnitClass)
@@ -80,7 +89,16 @@ object ProtoTypes {
       val res = pt.widenExpr match {
         case pt: FunProto =>
           mt match {
-            case mt: MethodType => constrainResult(resultTypeApprox(mt), pt.resultType)
+            case mt: MethodType =>
+              constrainResult(resultTypeApprox(mt), pt.resultType)
+              && {
+                if ctx.mode.is(Mode.ConstrainResultDeep) then
+                  if mt.isImplicitMethod == (pt.applyKind == ApplyKind.Using) then
+                    val tpargs = pt.args.lazyZip(mt.paramInfos).map(pt.typedArg)
+                    tpargs.tpes.corresponds(mt.paramInfos)(_ <:< _)
+                  else true
+                else true
+              }
             case _ => true
           }
         case _: ValueTypeOrProto if !disregardProto(pt) =>
@@ -123,6 +141,7 @@ object ProtoTypes {
   abstract case class IgnoredProto(ignored: Type) extends CachedGroundType with MatchAlways:
     override def revealIgnored = ignored
     override def deepenProto(using Context): Type = ignored
+    override def deepenProtoTrans(using Context): Type = ignored.deepenProtoTrans
 
     override def computeHash(bs: Hashable.Binders): Int = doHash(bs, ignored)
 
@@ -202,7 +221,12 @@ object ProtoTypes {
     def map(tm: TypeMap)(using Context): SelectionProto = derivedSelectionProto(name, tm(memberProto), compat)
     def fold[T](x: T, ta: TypeAccumulator[T])(using Context): T = ta(x, memberProto)
 
-    override def deepenProto(using Context): SelectionProto = derivedSelectionProto(name, memberProto.deepenProto, compat)
+    override def deepenProto(using Context): SelectionProto =
+      derivedSelectionProto(name, memberProto.deepenProto, compat)
+
+    override def deepenProtoTrans(using Context): SelectionProto =
+      derivedSelectionProto(name, memberProto.deepenProtoTrans, compat)
+
     override def computeHash(bs: Hashable.Binders): Int = {
       val delta = (if (compat eq NoViewsAllowed) 1 else 0) | (if (privateOK) 2 else 0)
       addDelta(doHash(bs, name, memberProto), delta)
@@ -419,7 +443,11 @@ object ProtoTypes {
     def fold[T](x: T, ta: TypeAccumulator[T])(using Context): T =
       ta(ta.foldOver(x, typedArgs().tpes), resultType)
 
-    override def deepenProto(using Context): FunProto = derivedFunProto(args, resultType.deepenProto, typer)
+    override def deepenProto(using Context): FunProto =
+      derivedFunProto(args, resultType.deepenProto, typer)
+
+    override def deepenProtoTrans(using Context): FunProto =
+      derivedFunProto(args, resultType.deepenProtoTrans, typer)
 
     override def withContext(newCtx: Context): ProtoType =
       if newCtx `eq` protoCtx then this
@@ -472,7 +500,11 @@ object ProtoTypes {
     def fold[T](x: T, ta: TypeAccumulator[T])(using Context): T =
       ta(ta(x, argType), resultType)
 
-    override def deepenProto(using Context): ViewProto = derivedViewProto(argType, resultType.deepenProto)
+    override def deepenProto(using Context): ViewProto =
+      derivedViewProto(argType, resultType.deepenProto)
+
+    override def deepenProtoTrans(using Context): ViewProto =
+      derivedViewProto(argType, resultType.deepenProtoTrans)
   }
 
   class CachedViewProto(argType: Type, resultType: Type) extends ViewProto(argType, resultType) {
@@ -522,7 +554,11 @@ object ProtoTypes {
     def fold[T](x: T, ta: TypeAccumulator[T])(using Context): T =
       ta(ta.foldOver(x, targs.tpes), resultType)
 
-    override def deepenProto(using Context): PolyProto = derivedPolyProto(targs, resultType.deepenProto)
+    override def deepenProto(using Context): PolyProto =
+      derivedPolyProto(targs, resultType.deepenProto)
+
+    override def deepenProtoTrans(using Context): PolyProto =
+      derivedPolyProto(targs, resultType.deepenProtoTrans)
   }
 
   /** A prototype for expressions [] that are known to be functions:
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3182,9 +3182,11 @@ class Typer extends Namer
             val arg = inferImplicitArg(formal, tree.span.endPos)
             arg.tpe match
               case failed: AmbiguousImplicits =>
-                val pt1 = pt.deepenProto
+                val pt1 = pt.deepenProtoTrans
                 if (pt1 `ne` pt) && (pt1 ne sharpenedPt)
-                   && constrainResult(tree.symbol, wtp, pt1)
+                   && withMode(Mode.ConstrainResultDeep)(
+                        constrainResult(tree.symbol, wtp, pt1)
+                      )
                 then implicitArgs(formals, argIndex, pt1)
                 else arg :: implicitArgs(formals1, argIndex + 1, pt1)
               case failed: SearchFailureType =>
diff --git a/tests/neg/i6391.scala b/tests/neg/i6391.scala
@@ -1,4 +1,4 @@
 object Test {
   def foo(x: String, y: x.type): Any = ???
-  val f = foo  // error // error: cannot convert to closure
-}
+  val f = foo  // error
+}
diff --git a/tests/pos/i11243.scala b/tests/pos/i11243.scala
@@ -0,0 +1,127 @@
+object WriterTest extends App {
+
+  object Functor:
+    def apply[F[_]](using f: Functor[F]) = f
+
+  trait Functor[F[_]]:
+    extension [A, B](x: F[A])
+      def map(f: A => B): F[B]
+
+  object Applicative:
+    def apply[F[_]](using a: Applicative[F]) = a
+
+  trait Applicative[F[_]] extends Functor[F]:
+    def pure[A](x:A):F[A]
+
+    extension [A,B](x: F[A])
+      def ap(f: F[A => B]): F[B]
+
+      def map(f: A => B): F[B] = {
+        x.ap(pure(f))
+      }
+
+    extension [A,B,C](fa: F[A]) def map2(fb: F[B])(f: (A,B) => C): F[C] = {
+      val fab: F[B => C] = fa.map((a: A) => (b: B) => f(a,b))
+      fb.ap(fab)
+    }
+
+  end Applicative
+
+
+  object Monad:
+    def apply[F[_]](using m: Monad[F]) = m
+
+  trait Monad[F[_]] extends Applicative[F]:
+
+    // The unit value for a monad
+    def pure[A](x:A):F[A]
+
+    extension[A,B](fa :F[A])
+      // The fundamental composition operation
+        def flatMap(f :A=>F[B]):F[B]
+
+        // Monad can also implement `ap` in terms of `map` and `flatMap`
+        def ap(fab: F[A => B]): F[B] = {
+          fab.flatMap {
+            f =>
+              fa.flatMap {
+                a =>
+                  pure(f(a))
+              }
+          }
+
+        }
+
+  end Monad
+
+  given eitherMonad[Err]: Monad[[X] =>> Either[Err,X]] with
+    def pure[A](a: A): Either[Err, A] = Right(a)
+    extension [A,B](x: Either[Err,A]) def flatMap(f: A => Either[Err, B]) = {
+      x match {
+        case Right(a) => f(a)
+        case Left(err) => Left(err)
+      }
+    }
+
+  given optionMonad: Monad[Option] with
+    def pure[A](a: A) = Some(a)
+    extension[A,B](fa: Option[A])
+      def flatMap(f: A => Option[B]) = {
+        fa match {
+          case Some(a) =>
+            f(a)
+          case None =>
+            None
+        }
+      }
+
+  given listMonad: Monad[List] with
+    def pure[A](a: A): List[A] = List(a)
+
+    extension[A,B](x: List[A])
+      def flatMap(f: A => List[B]): List[B] = {
+        x match {
+          case hd :: tl => f(hd) ++ tl.flatMap(f)
+          case Nil => Nil
+        }
+      }
+
+  case class Transformer[F[_]: Monad,A](val wrapped: F[A])
+
+  given transformerMonad[F[_]: Monad]: Monad[[X] =>> Transformer[F,X]] with {
+
+    def pure[A](a: A): Transformer[F,A] = Transformer(summon[Monad[F]].pure(a))
+
+    extension [A,B](fa: Transformer[F,A])
+      def flatMap(f: A => Transformer[F,B]) = {
+        val ffa: F[B] = Monad[F].flatMap(fa.wrapped) {
+          case a => {
+            f(a).wrapped.map {
+              case b =>
+                b
+            }
+          }
+        }
+        Transformer(ffa)
+      }
+  }
+
+  type EString[A] = Either[String,A]
+
+  def incrementEven(a: Int): Transformer[EString,Int] = {
+    if(a % 2 == 1) Transformer(Left("Odd number provided"))
+    else Transformer(Right(a + 1))
+  }
+
+  def doubleOdd(a: Int): Transformer[EString, Int] = {
+    if(a % 2 == 0) Transformer(Left("Even number provided"))
+    else Transformer(Right(a * 2))
+  }
+
+  val writerExample = incrementEven(8)
+  val example =
+    WriterTest.transformerMonad.flatMap(writerExample)(doubleOdd)
+    //writerExample.flatMap(doubleOdd) // Error ambiguous F
+
+
+}
diff --git a/tests/pos/i5773b.scala b/tests/pos/i5773b.scala
@@ -10,15 +10,15 @@ object Semigroup {
 
   implicit def sumSemigroup[N](implicit N: Numeric[N]): Semigroup[N] = new {
     extension (lhs: N) override def append(rhs: N): N = N.plus(lhs, rhs)
-    extension (lhs: Int) def appendS(rhs: N): N = ??? // N.plus(lhs, rhs)
+    extension (lhs: Int) override def appendS(rhs: N): N = ??? // N.plus(lhs, rhs)
   }
 }
 
 
 object Main {
   import Semigroup.sumSemigroup // this is not sufficient
   def f1 = {
-    println(1 appendS 2) // error This should give the following error message:
+    println(1 appendS 2) // This used to give the following error message:
 /*
 21 |    println(1 appendS 2)
    |            ^^^^^^^^^
