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

FIR: resolve conflicts around SAM calls properly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-04-20 22:49:40 +03:00
committed by Space
parent 93dad4837c
commit 7c89f0188a
25 changed files with 107 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
Vendored
-29
View File
@@ -1,29 +0,0 @@
// !CHECK_TYPE
// FILE: StaticOverrides.java
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
public class StaticOverrides {
public static class A {
public static int foo(Runnable x) { return 0; }
public static boolean foo(Function0<Unit> x) { return true; }
}
public static class B {
public static String foo(Runnable x) { return ""; }
}
public static class C extends A {
public static String foo(Runnable x) { return ""; }
}
}
// FILE: test.kt
fun test() {
StaticOverrides.A.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!> {} <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>checkType<!> { _<Boolean>() }
StaticOverrides.B.foo {} checkType { _<String>() }
StaticOverrides.C.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!> {} <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>checkType<!> { _<Boolean>() }
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !CHECK_TYPE
// FILE: StaticOverrides.java
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt
Vendored
-24
View File
@@ -1,24 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE
// FILE: Foo.java
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
class Foo {
interface FObject<T> {
void invoke(T i);
}
public String foo(FObject<Integer> f) { return ""; }
public int foo(Function1<Integer, Unit> f) { return 1; }
public String bar(FObject<Object> f) { return ""; }
public int bar(Function1<Integer, Unit> f) { return 1; }
}
// FILE: 1.kt
fun test() {
Foo().<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!> {} <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>checkType<!> { _<Int>() }
Foo().<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!> {} <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>checkType<!> { _<String>() }
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.fir.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE
// FILE: Foo.java
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
public class Foo {
interface FObject {
void invoke(Object i);
}
public String test(FObject f) { return ""; }
public int test(Function1<Integer, Unit> f) { return 1; }
}
// FILE: 1.kt
fun bar() {
Foo().<!OVERLOAD_RESOLUTION_AMBIGUITY!>test<!> {} <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>checkType<!> { _<String>() }
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE