Merge pull request #10317 from dotty-staging/fix-#10016

Fix #10016: Bypass normalize for context function closure arguments

Author: liufengyun

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

@@ -677,7 +677,9 @@ trait Applications extends Compatibility {
    */
   class ApplicableToTrees(methRef: TermRef, args: List[Tree], resultType: Type)(using Context)
   extends TestApplication(methRef, methRef.widen, args, resultType) {
-    def argType(arg: Tree, formal: Type): Type = normalize(arg.tpe, formal)
+    def argType(arg: Tree, formal: Type): Type =
+      if untpd.isContextualClosure(arg) && defn.isContextFunctionType(formal) then arg.tpe
+      else normalize(arg.tpe, formal)
     def treeToArg(arg: Tree): Tree = arg
     def isVarArg(arg: Tree): Boolean = tpd.isWildcardStarArg(arg)
     def typeOfArg(arg: Tree): Type = arg.tpe

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

@@ -632,7 +632,8 @@ object ProtoTypes {
         normalize(et.resultType, pt)
       case wtp =>
         val iftp = defn.asContextFunctionType(wtp)
-        if (iftp.exists) normalize(iftp.dropDependentRefinement.argInfos.last, pt) else tp
+        if iftp.exists then normalize(iftp.dropDependentRefinement.argInfos.last, pt)
+        else tp
     }
   }
 

tests/run/i10016.scala

@@ -0,0 +1,5 @@
+def f(init: Int ?=> Int) : Int = 1
+def f(s: String)(init: Int ?=> Int) : Int = 2
+
+@main def Test() =
+  assert(f((using x:Int) => x) == 1)