Avoid skipping lambda argument processing in case of explicit type param

#KT-38691 fixed
This commit is contained in:
Ilya Chernikov
2020-05-06 22:30:09 +02:00
parent ec98d61520
commit 7e3dfb245b
7 changed files with 72 additions and 5 deletions
@@ -0,0 +1,14 @@
// !LANGUAGE: +NewInference
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
class Inv<T>
fun <T> materializeInv() = Inv<T>()
fun <X> foo(x: Inv<X>, y: X) = materializeInv<X>()
fun <X> foo(x: Inv<X>, y: () -> X) = materializeInv<X>()
fun <R> main(fn: () -> R) {
fun bar(): R = null as R
val x1 = foo<R>(materializeInv()) { fn() } // OVERLOAD_RESOLUTION_AMBIGUITY only in NI
val x2 = foo<R>(materializeInv(), fn) // OK
val x3 = foo<R>(materializeInv(), ::bar) // OK
}
@@ -0,0 +1,14 @@
// !LANGUAGE: +NewInference
// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
class Inv<T>
fun <T> materializeInv() = Inv<T>()
fun <X> foo(x: Inv<X>, y: X) = materializeInv<X>()
fun <X> foo(x: Inv<X>, y: () -> X) = materializeInv<X>()
fun <R> main(fn: () -> R) {
fun bar(): R = null <!UNCHECKED_CAST!>as R<!>
val x1 = foo<R>(materializeInv()) { fn() } // OVERLOAD_RESOLUTION_AMBIGUITY only in NI
val x2 = foo<R>(materializeInv(), fn) // OK
val x3 = foo<R>(materializeInv(), ::bar) // OK
}
@@ -0,0 +1,13 @@
package
public fun </*0*/ X> foo(/*0*/ x: Inv<X>, /*1*/ y: () -> X): Inv<X>
public fun </*0*/ X> foo(/*0*/ x: Inv<X>, /*1*/ y: X): Inv<X>
public fun </*0*/ R> main(/*0*/ fn: () -> R): kotlin.Unit
public fun </*0*/ T> materializeInv(): Inv<T>
public final class Inv</*0*/ T> {
public constructor Inv</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}