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

K2: use intersection scope override checker also in intersection scope

Browse Source 
In more details, we use either platform override checker (if we came
from platform) or the combined intersection scope override checker
at this place. Also this commit fixes various places around
JavaOverrideChecker, allowing to apply it in intersection override
checker properly:
- don't consider return types in this place
- apply JavaOverrideChecker if at least one candidate is from Java
- compare type primitivity closer to K1 logic

#KT-62554 Fixed
Partially fixes KT-63242
This commit is contained in:
Mikhail Glukhikh
2023-11-23 11:22:16 +01:00
committed by Space Team
parent 54d978ba86
commit e42c1be354
35 changed files with 141 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/fir/primitiveDoubleJavaKotlinIntersection.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_K2: JVM_IR
// IGNORE_LIGHT_ANALYSIS
// (Unresolved reference: B supertype in C declaration)
// ISSUE: KT-63242
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleType.fir.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: C:foo
// FILE: A.java
public class A {
public void foo(Integer x) {}
}
// FILE: main.kt
interface B {
fun foo(x: Int) {}
}
<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class C<!> : A(), B
fun main() {
C().foo(42)
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleType.fir.overrides.txt
Vendored
-4
View File
@@ -1,4 +0,0 @@
C:
[IntersectionOverride]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/Unit| from Use site scope of /C [id: 0]
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/Unit| from Java enhancement scope for /A [id: 1]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/Unit| from Use site scope of /B [id: 2]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleType.fir.txt
Vendored
+1 -1
View File
@@ -11,5 +11,5 @@ FILE: main.kt
}
public final fun main(): R|kotlin/Unit| {
R|/C.C|().R|/A.foo|(Int(42))
R|/C.C|().R|/B.foo|(Int(42))
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleType.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: C:foo
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleType.overrides.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
C:
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/Unit| from Use site scope of /C [id: 0]
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/Unit| from Java enhancement scope for /A [id: 0]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/Unit| from Use site scope of /C [id: 0]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/Unit| from Use site scope of /B [id: 0]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution.fir.kt
Vendored
-24
View File
@@ -1,24 +0,0 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: D:foo
// FILE: A.java
public class A<T> {
public T foo(Integer x) {
return "A";
}
}
// FILE: main.kt
interface B {
fun foo(x: Int) = "B"
}
open class C : A<String>()
<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class D<!> : C(), B
fun main() {
D().foo(42)
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution.fir.overrides.txt
Vendored
-6
View File
@@ -1,6 +0,0 @@
D:
[IntersectionOverride]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /C [id: 1]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /A] for type C [id: 1]
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|ft<T & Any, T?>| from Java enhancement scope for /A [id: 2]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /B [id: 3]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: D:foo
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution.overrides.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
D:
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /C [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /A] for type C [id: 0]
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|ft<T & Any, T?>| from Java enhancement scope for /A [id: 1]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 0]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /B [id: 0]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution2.fir.kt
Vendored
-26
View File
@@ -1,26 +0,0 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: D:foo
// FILE: A.java
public class A<T> {
public String foo(T x) {
return "A";
}
}
// FILE: C.java
public class C extends A<Integer> {}
// FILE: main.kt
interface B {
fun foo(x: Int) = "B"
}
<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class D<!> : C(), B
fun main() {
D().foo(42)
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution2.fir.overrides.txt
Vendored
-6
View File
@@ -1,6 +0,0 @@
D:
[IntersectionOverride]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Java enhancement scope for /C [id: 1]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /A] for type C [id: 1]
[Enhancement]: public open fun foo(x: R|ft<T & Any, T?>|): R|kotlin/String!| from Java enhancement scope for /A [id: 2]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /B [id: 3]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution2.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: D:foo
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution2.overrides.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
D:
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Java enhancement scope for /C [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /A] for type C [id: 0]
[Enhancement]: public open fun foo(x: R|ft<T & Any, T?>|): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 0]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /B [id: 0]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution3.fir.kt
Vendored
-24
View File
@@ -1,24 +0,0 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: D:foo
// FILE: A.java
public class A<T> {
public String foo(T x) {
return "A";
}
}
// FILE: main.kt
interface B {
fun foo(x: Int) = "B"
}
open class C : A<Int>()
<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class D<!> : C(), B
fun main() {
D().foo(42)
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution3.fir.overrides.txt
Vendored
-6
View File
@@ -1,6 +0,0 @@
D:
[IntersectionOverride]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /C [id: 1]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /A] for type C [id: 1]
[Enhancement]: public open fun foo(x: R|ft<T & Any, T?>|): R|kotlin/String!| from Java enhancement scope for /A [id: 2]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /B [id: 3]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution3.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: D:foo
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution3.overrides.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
D:
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /C [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /A] for type C [id: 0]
[Enhancement]: public open fun foo(x: R|ft<T & Any, T?>|): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 0]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /B [id: 0]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution4.fir.kt
Vendored
+2
View File
@@ -1,6 +1,8 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: E:foo
// IGNORE_REVERSED_RESOLVE
// ^ resolves to C.foo instead of D.foo for some reason, does not seem important
// FILE: A.java
public class A<T> {
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution4.kt
Vendored
+2
View File
@@ -1,6 +1,8 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: E:foo
// IGNORE_REVERSED_RESOLVE
// ^ resolves to C.foo instead of D.foo for some reason, does not seem important
// FILE: A.java
public class A<T> {
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution5.fir.kt
Vendored
-24
View File
@@ -1,24 +0,0 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: E:foo
// FILE: A.java
public class A {
public String foo(Integer x) {
return "A";
}
}
// FILE: main.kt
interface B<T> {
fun foo(x: T) = "B"
}
interface D : B<Int>
<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class E<!> : A(), D
fun main() {
E().foo(42)
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution5.fir.txt
Vendored
+1 -1
View File
@@ -14,5 +14,5 @@ FILE: main.kt
}
public final fun main(): R|kotlin/Unit| {
R|/E.E|().R|/D.foo|(Int(42))
R|/E.E|().R|SubstitutionOverride</D.foo: R|kotlin/String|>|(Int(42))
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution5.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: E:foo
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution5.fir.overrides.txt → compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithFlexibleTypeAndSubstitution5.overrides.txt
Vendored
+6 -5
View File
@@ -1,6 +1,7 @@
E:
[IntersectionOverride]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /E [id: 0]
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 2]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Substitution scope for [Use site scope of /B] for type D [id: 2]
[Source]: public open fun foo(x: R|T|): R|kotlin/String| from Use site scope of /B [id: 3]
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Use site scope of /E [id: 0]
[Enhancement]: public open fun foo(x: R|kotlin/Int!|): R|kotlin/String!| from Java enhancement scope for /A [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /E [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Use site scope of /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public open fun foo(x: R|kotlin/Int|): R|kotlin/String| from Substitution scope for [Use site scope of /B] for type D [id: 0]
[Source]: public open fun foo(x: R|T|): R|kotlin/String| from Use site scope of /B [id: 1]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithNotNullType.fir.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: C:foo
// FILE: A.java
import org.jetbrains.annotations.*;
public class A {
public void foo(@NotNull Integer x) {}
}
// FILE: main.kt
interface B {
fun foo(x: Int) {}
}
<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class C<!> : A(), B
fun main() {
C().foo(42)
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithNotNullType.fir.overrides.txt
Vendored
-4
View File
@@ -1,4 +0,0 @@
C:
[IntersectionOverride]: public open fun foo(x: R|@EnhancedNullability kotlin/Int|): R|kotlin/Unit| from Use site scope of /C [id: 0]
[Enhancement]: public open fun foo(x: R|@EnhancedNullability kotlin/Int|): R|kotlin/Unit| from Java enhancement scope for /A [id: 1]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/Unit| from Use site scope of /B [id: 2]
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithNotNullType.fir.txt
Vendored
+1 -1
View File
@@ -11,5 +11,5 @@ FILE: main.kt
}
public final fun main(): R|kotlin/Unit| {
R|/C.C|().R|/A.foo|(Int(42))
R|/C.C|().<Ambiguity: foo, [/A.foo, /B.foo]>#(Int(42))
}
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithNotNullType.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// ISSUE: KT-62554
// FIR_DUMP
// SCOPE_DUMP: C:foo
compiler/testData/diagnostics/tests/j+k/primitiveOverrides/triangleWithNotNullType.overrides.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
C:
[Enhancement]: public open fun foo(x: R|@EnhancedNullability kotlin/Int|): R|kotlin/Unit| from Use site scope of /C [id: 0]
[Enhancement]: public open fun foo(x: R|@EnhancedNullability kotlin/Int|): R|kotlin/Unit| from Java enhancement scope for /A [id: 0]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/Unit| from Use site scope of /C [id: 0]
[Source]: public open fun foo(x: R|kotlin/Int|): R|kotlin/Unit| from Use site scope of /B [id: 0]
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/intersectionOfPrimitiveBasedFunctions.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ interface II {
fun replace(key: Int, value: Int): Int? = null
}
abstract <!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class ZI<!> : MyMap<Int, Int>(), II
abstract class ZI : MyMap<Int, Int>(), II
interface IS {
fun replace(key: String, value: String): String? = null