Skip to content

Commit dba8eaa

Browse files
smartertgodzik
authored andcommitted
Make overload pruning based on result types less aggressive
`adaptByResult` was introduced in 2015 in 54835b6 as a last step in overloading resolution: > Take expected result type into account more often for overloading resolution > > Previously, the expected result type of a FunProto type was ignored and taken into > account only in case of ambiguities. arrayclone-new.scala shows that this is not enough. > In a case like > > val x: Array[Byte] = Array(1, 2) > > we typed 1, 2 to be Int, so overloading resulution would give the Array.apply of > type (Int, Int*)Array[Int]. But that's a dead end, since Array[Int] is not a subtype > of Array[Byte]. > > This commit proposes the following modified rule for overloading resulution: > > A method alternative is applicable if ... (as before), and if its result type > is copmpatible with the expected type of the method application. > > The commit does not pre-select alternatives based on comparing with the expected > result type. I tried that but it slowed down typechecking by a factor of at least 4. > Instead, we proceed as usual, ignoring the result type except in case of > ambiguities, but check whether the result of overloading resolution has a > compatible result type. If that's not the case, we filter all alternatives > for result type compatibility and try again. In i21410.scala this means we end up checking: F[?U] <:< Int (where ?U is unconstrained, because the check is done without looking at the argument types) The problem is that the subtype check returning false does not mean that there is no instantiation of `?U` that would make this check return true, just that type inference was not able to come up with one. This could happen for any number of reason but commonly will happen with match types since inference cannot do much with them. We cannot avoid this by taking the argument types into account, because this logic was added precisely to handle cases where the argument types mislead you because adaptation isn't taken into account. Instead, we can approximate type variables in the result type to trade false negatives for false positives which should be less problematic here. Fixes scala#21410. [Cherry-picked 528d0f0]
1 parent 2df2319 commit dba8eaa

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -1949,16 +1949,20 @@ trait Applications extends Compatibility {
19491949
def resolveOverloaded(alts: List[TermRef], pt: Type)(using Context): List[TermRef] =
19501950
record("resolveOverloaded")
19511951

1952-
/** Is `alt` a method or polytype whose result type after the first value parameter
1952+
/** Is `alt` a method or polytype whose approximated result type after the first value parameter
19531953
* section conforms to the expected type `resultType`? If `resultType`
19541954
* is a `IgnoredProto`, pick the underlying type instead.
1955+
*
1956+
* Using approximated result types is necessary to avoid false negatives
1957+
* due to incomplete type inference such as in tests/pos/i21410.scala.
19551958
*/
19561959
def resultConforms(altSym: Symbol, altType: Type, resultType: Type)(using Context): Boolean =
19571960
resultType.revealIgnored match {
19581961
case resultType: ValueType =>
19591962
altType.widen match {
1960-
case tp: PolyType => resultConforms(altSym, instantiateWithTypeVars(tp), resultType)
1961-
case tp: MethodType => constrainResult(altSym, tp.resultType, resultType)
1963+
case tp: PolyType => resultConforms(altSym, tp.resultType, resultType)
1964+
case tp: MethodType =>
1965+
constrainResult(altSym, wildApprox(tp.resultType), resultType)
19621966
case _ => true
19631967
}
19641968
case _ => true

tests/pos/i21410.scala

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
class A
2+
object Test:
3+
type F[X] <: Any = X match
4+
case A => Int
5+
6+
def foo[T](x: String): T = ???
7+
def foo[U](x: U): F[U] = ???
8+
9+
val x1 = foo(A())
10+
val y: Int = x1
11+
12+
val x2: Int = foo(A()) // error

0 commit comments

Comments
 (0)