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

[FIR] Don't drop directly inherited functions from origins for intersection overrides in intersection scope

Browse Source 
```
open class Base<T> {
    fun foo(): T = ...
}

class Derived<T> : Base<T> {
    override fun foo(): T = ...
}
```

In intersection scope of type `Base<T> & Other<R>` we should create
  intersection override based on `Base.foo(): T` and `Derived.foo(): R`
  at the same time, despite the fact that `Derived.foo` actually directly
  overrides `Base.foo`

^KT-56722 Fixed
This commit is contained in:
Dmitriy Novozhilov
2023-02-23 20:19:20 +02:00
committed by Space Team
parent e0fa1e64b9
commit 8ff4af034a
7 changed files with 71 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/smartcastToStarProjectedSubclass.fir.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
FILE: test.kt
public final fun test_1(option: R|Option<kotlin/Pair<kotlin/String, kotlin/String>>?|): R|kotlin/Unit| {
when () {
(R|<local>/option| is R|Option.Some<*>|) -> {
lval x: R|kotlin/String| = R|<local>/option|.R|/Option.Some.get|().R|SubstitutionOverride<kotlin/Pair.first: R|kotlin/String|>|
R|<local>/x|.R|kotlin/String.length|
}
}
}
public final fun test_2(option: R|Option<kotlin/Pair<kotlin/String, kotlin/String>>?|): R|kotlin/Unit| {
when () {
(R|<local>/option| is R|Option.Some<kotlin/Pair<kotlin/String, kotlin/String>>|) -> {
lval x: R|kotlin/String| = R|<local>/option|.R|SubstitutionOverride</Option.Some.get: R|ft<kotlin/Pair<kotlin/String, kotlin/String>, kotlin/Pair<kotlin/String, kotlin/String>?>|>|().R|SubstitutionOverride<kotlin/Pair.first: R|kotlin/String|>|
R|<local>/x|.R|kotlin/String.length|
}
}
}
compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/smartcastToStarProjectedSubclass.kt
Vendored
+28
View File
@@ -0,0 +1,28 @@
// WITH_STDLIB
// ISSUE: KT-56722
// FILE: Option.java
public interface Option<T> {
T get();
public final class Some<T> implements Option<T> {
@Override
public T get() {
return null;
}
}
}
// FILE: test.kt
fun test_1(option: Option<Pair<String, String>>?) {
if (option is Option.Some<*>) {
val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Pair<kotlin.String, kotlin.String>..kotlin.Pair<kotlin.String, kotlin.String>?!")!>option.get()<!>.first
x.length
}
}
fun test_2(option: Option<Pair<String, String>>?) {
if (option is Option.Some) {
val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Pair<kotlin.String, kotlin.String>..kotlin.Pair<kotlin.String, kotlin.String>?!")!>option.get()<!>.first
x.length
}
}