Merge pull request #6756 from dotty-staging/poly-apply

Handle polymorphic overloads with apply members

Author: odersky

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

@@ -1518,7 +1518,15 @@ trait Applications extends Compatibility { self: Typer with Dynamic =>
 
     /** Replace each alternative by its apply members where necessary */
     def applyMembers(alt: TermRef): List[TermRef] =
-      if (tryApply(alt)) alt.member(nme.apply).alternatives.map(TermRef(alt, nme.apply, _))
+      if (tryApply(alt)) {
+        val qual = alt.widen match {
+          case pt: PolyType =>
+            wildApprox(pt.resultType)
+          case _ =>
+            alt
+        }
+        qual.member(nme.apply).alternatives.map(TermRef(alt, nme.apply, _))
+      }
       else alt :: Nil
 
     /** Fall back from an apply method to its original alternative */

tests/neg/poly-overloads.scala

@@ -0,0 +1,23 @@
+class A {
+  def foo1(x: Int): Int = x
+  def foo1[T]: String => T = ???
+
+  foo1("") // ok
+
+  def foo2(x: Int): Int = x
+  def foo2[T]: T => String = ???
+
+  foo2(1): String // ok
+  foo2("") // ok, unlike Scala 2
+
+  def foo3(x: Any): Any = x
+  def foo3[T <: Int]: T => T = x => x
+
+  val a = foo3(1) // ok
+  val b: Int = a // ok, unlike Scala 2 which prefers the first overload
+
+  def foo4(x: Any): Any = x
+  def foo4[T >: Int]: T => T = x => x
+
+  val c = foo4(1) // error, unlike Scala 2 this is ambiguous
+}