azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation exception where overload ambiguity should be

Browse Source 
#KT-16246 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2017-09-05 13:40:50 +03:00
parent ec512d1c8a
commit 6d4bb229ac
6 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt
Vendored
+18
View File
@@ -0,0 +1,18 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
import kotlin.reflect.KCallable
class Foo {
fun <T> installRoute(handler: T) where T : (String) -> Any?, T : KCallable<*> {
}
fun <T> installRoute(handler: T) where T : () -> Any?, T : KCallable<*> {
}
fun foo() {
<!OVERLOAD_RESOLUTION_AMBIGUITY!>installRoute<!><Any>(::route)
}
}
fun route(s: String): Any? = null
compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.txt
Vendored
+13
View File
@@ -0,0 +1,13 @@
package
public fun route(/*0*/ s: kotlin.String): kotlin.Any?
public final class Foo {
public constructor Foo()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final fun </*0*/ T : () -> kotlin.Any?> installRoute(/*0*/ handler: T): kotlin.Unit where T : kotlin.reflect.KCallable<*>
public final fun </*0*/ T : (kotlin.String) -> kotlin.Any?> installRoute(/*0*/ handler: T): kotlin.Unit where T : kotlin.reflect.KCallable<*>
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt
Vendored
+2 -2
View File
@@ -20,7 +20,7 @@ val x1 = fn1(1, ::foo, ::foo)
val x2 = fn1(1, ::foo, ::bar)
val x3 = fn2(::bar, ::foo)
val x4 = fn2(::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>, ::bar)
val x5 = fn2(::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>, ::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>)
val x4 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>fn2<!>(::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>, ::bar)
val x5 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>fn2<!>(::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>, ::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>)
val x6 = fn3(1, ::qux)