Merge pull request #4428 from dotty-staging/fix-4419

Fix #4419: liftFun should also update method parameter types

Author: odersky

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

@@ -193,6 +193,12 @@ trait Applications extends Compatibility { self: Typer with Dynamic =>
      */
     protected def liftFun(): Unit = ()
 
+    /** Whether `liftFun` is needed? It is the case if default arguments are used.
+     */
+    protected def needLiftFun: Boolean =
+      !isJavaAnnotConstr(methRef.symbol) &&
+      args.size < reqiredArgNum(funType)
+
     /** A flag signalling that the typechecking the application was so far successful */
     private[this] var _ok = true
 
@@ -205,12 +211,25 @@ trait Applications extends Compatibility { self: Typer with Dynamic =>
     /** The function's type after widening and instantiating polytypes
      *  with TypeParamRefs in constraint set
      */
-    val methType = funType.widen match {
+    lazy val methType: Type = liftedFunType.widen match {
       case funType: MethodType => funType
       case funType: PolyType => constrained(funType).resultType
       case tp => tp //was: funType
     }
 
+    def reqiredArgNum(tp: Type): Int = tp.widen match {
+      case funType: MethodType => funType.paramInfos.size
+      case funType: PolyType => reqiredArgNum(funType.resultType)
+      case tp => args.size
+    }
+
+    lazy val liftedFunType =
+      if (needLiftFun) {
+        liftFun()
+        normalizedFun.tpe
+      }
+      else funType
+
     /** The arguments re-ordered so that each named argument matches the
      *  same-named formal parameter.
      */
@@ -231,6 +250,7 @@ trait Applications extends Compatibility { self: Typer with Dynamic =>
             ()
           else
             fail(err.typeMismatchMsg(methType.resultType, resultType))
+
         // match all arguments with corresponding formal parameters
         matchArgs(orderedArgs, methType.paramInfos, 0)
       case _ =>
@@ -425,8 +445,6 @@ trait Applications extends Compatibility { self: Typer with Dynamic =>
           }
 
           def tryDefault(n: Int, args1: List[Arg]): Unit = {
-            if (!isJavaAnnotConstr(methRef.symbol))
-              liftFun()
             val getter = findDefaultGetter(n + numArgs(normalizedFun))
             if (getter.isEmpty) missingArg(n)
             else {

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

@@ -46,7 +46,8 @@ abstract class Lifter {
     if (noLift(expr)) expr
     else {
       val name = UniqueName.fresh(prefix)
-      var liftedType = fullyDefinedType(expr.tpe.widen, "lifted expression", expr.pos)
+      // don't instantiate here, as the type params could be further constrained, see tests/pos/pickleinf.scala
+      var liftedType = expr.tpe.widen
       if (liftedFlags.is(Method)) liftedType = ExprType(liftedType)
       val lifted = ctx.newSymbol(ctx.owner, name, liftedFlags, liftedType, coord = positionCoord(expr.pos))
       defs += liftedDef(lifted, expr).withPos(expr.pos)

tests/pos/i4419.scala

@@ -0,0 +1,12 @@
+class Foo(config: String) {
+  case class Bar(val x: Int) {
+    def doThings: String = config //Do whatever here
+  }
+}
+
+
+object Test {
+  def test(foo: Foo)(bar: foo.Bar = foo.Bar(5)) = ???
+
+  test(new Foo("port"))()
+}