Merge pull request #2031 from dotty-staging/fix-#2030

Fix #2030: Don't chain implicit conversions

Author: odersky

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

@@ -1384,7 +1384,7 @@ trait Applications extends Compatibility { self: Typer with Dynamic =>
                 else WildcardType)
               val commonFormal = defn.FunctionOf(commonParamTypes, WildcardType)
               overload.println(i"pretype arg $arg with expected type $commonFormal")
-              pt.typedArg(arg, commonFormal)
+              pt.typedArg(arg, commonFormal)(ctx.addMode(Mode.ImplicitsEnabled))
             }
           }
         }

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

@@ -496,6 +496,7 @@ trait Implicits { self: Typer =>
         || (to isRef defn.UnitClass)
         || (from.tpe isRef defn.NothingClass)
         || (from.tpe isRef defn.NullClass)
+        || !(ctx.mode is Mode.ImplicitsEnabled)
         || (from.tpe eq NoPrefix)) NoImplicitMatches
     else
       try inferImplicit(to.stripTypeVar.widenExpr, from, from.pos)

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

@@ -2023,7 +2023,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
       // try an implicit conversion
       inferView(tree, pt) match {
         case SearchSuccess(inferred, _, _, _) =>
-          adapt(inferred, pt)
+          adapt(inferred, pt)(ctx.retractMode(Mode.ImplicitsEnabled))
         case failure: SearchFailure =>
           if (pt.isInstanceOf[ProtoType] && !failure.isInstanceOf[AmbiguousImplicits]) tree
           else err.typeMismatch(tree, pt, failure)

tests/neg/i2030.scala

@@ -0,0 +1,5 @@
+// This used to take ~12s, the check should be that
+// it runs in reasonable time (i.e. instantaneous).
+object a {
+   val x: String | Int = 'a // error
+}

tests/run/builder.check

@@ -1 +1 @@
-Table(Row(Cell(A1), Cell(B1)), Row(Cell(A2), Cell(B2)))
+Table(Row(Cell(top left), Cell(top right)), Row(Cell(botttom left), Cell(bottom right)))

tests/run/builder.scala

@@ -12,9 +12,7 @@ class Row {
   override def toString = cells.mkString("Row(", ", ", ")")
 }
 
-class Cell(elem: String) {
-  override def toString = s"Cell($elem)"
-}
+case class Cell(elem: String)
 
 object Test {
 
@@ -36,12 +34,12 @@ object Test {
   val data =
     table {
       row {
-        cell("A1")
-        cell("B1")
+        cell("top left")
+        cell("top right")
       }
       row {
-        cell("A2")
-        cell("B2")
+        cell("botttom left")
+        cell("bottom right")
       }
     }