Merge pull request #863 from dotty-staging/fix/inference-methcall

Fix/inference methcall

Author: smarter

src/dotty/tools/dotc/typer/Inferencing.scala

@@ -141,7 +141,7 @@ object Inferencing {
       if (toTest.isEmpty) acc
       else tree match {
         case Apply(fn, _) =>
-          fn.tpe match {
+          fn.tpe.widen match {
             case mtp: MethodType =>
               val (occ, nocc) = toTest.partition(tvar => mtp.paramTypes.exists(tvar.occursIn))
               occurring(fn, nocc, occ ::: acc)

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

@@ -563,7 +563,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
             val pos = params indexWhere (_.name == param.name)
             if (pos < mtpe.paramTypes.length) {
               val ptype = mtpe.paramTypes(pos)
-              if (isFullyDefined(ptype, ForceDegree.none)) return ptype
+              if (isFullyDefined(ptype, ForceDegree.noBottom)) return ptype
             }
           case _ =>
         }
@@ -1265,7 +1265,8 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
 
   def adapt(tree: Tree, pt: Type, original: untpd.Tree = untpd.EmptyTree)(implicit ctx: Context) = /*>|>*/ track("adapt") /*<|<*/ {
     /*>|>*/ ctx.traceIndented(i"adapting $tree of type ${tree.tpe} to $pt", typr, show = true) /*<|<*/ {
-      interpolateUndetVars(tree, if (tree.isDef) tree.symbol else NoSymbol)
+      if (tree.isDef) interpolateUndetVars(tree, tree.symbol)
+      else if (!tree.tpe.widen.isInstanceOf[MethodOrPoly]) interpolateUndetVars(tree, NoSymbol)
       tree.overwriteType(tree.tpe.simplified)
       adaptInterpolated(tree, pt, original)
     }

tests/pos/tparam_inf.scala

@@ -0,0 +1,38 @@
+class HasFoo[T] {
+  val x: Foo[T] = ???
+}
+class Foo[T] {
+  def get(x: T): T = x
+  def get2(x: T): Nothing = ???
+
+  def foo1(x: T)(implicit ev: T): Nothing = ???
+  def foo2(x: T)(implicit ev: T): T = ???
+  def foo3[Dummy](x: T)(implicit ev: T): Nothing = ???
+  def foo4[Dummy](x: T)(implicit ev: T): T = ???
+}
+
+object Test {
+
+  def foo1[T](x: T)(implicit ev: T): Nothing = ???
+  def foo2[T](x: T)(implicit ev: T): T = ???
+
+  def test1: Unit = {
+    implicit val ii: Int = 42
+
+    foo1(10)
+    foo2(10)
+  }
+
+  def hf[T]: HasFoo[T] = ???
+  def test2: Unit = {
+    implicit val ii: Int = 42
+
+    hf.x.get(10)
+    hf.x.get2(10)
+
+    hf.x.foo1(10)
+    hf.x.foo2(10)
+    hf.x.foo3(10)
+    hf.x.foo4(10)
+  }
+}