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

K2: repeat K1 representation for flexible type parameters

Browse Source 
This commit changes the behavior of KT-59138 effectively declining it in 2.0.
However, we plan to implement KT-59138 behavior under a feature
flag in 2.0 (see KT-66447), and switch this feature on version 2.x.

Also, this commit implements the LC resolution about postponing
KT-57014 change. We don't have KT-57014 described behavior in 2.0 anymore.
However, we plan to implement a deprecation warning here, see KT-65578.

After this commit, 6 diagnostic tests become incorrectly broken:
- 5 tests from PurelyImplementedCollection group
- a test platformTypes/nullableTypeArgument.kt

This commit also breaks currently fixed-in-k2 KT-50134
(it is fixed again in the following commits),
as well as KT-58933 (it will remain not fixed till we enable KT-59138
behavior again).

#KT-65596 In Progress
#KT-57014 In Progress
#KT-58933 Submitted
This commit is contained in:
Denis.Zharkov
2024-02-06 15:33:03 +01:00
committed by Space Team
parent 7fd46f1450
commit 81414d758d
160 changed files with 343 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
Vendored
+3 -3
View File
@@ -2,7 +2,7 @@ public open class RawOverrides : R|kotlin/Any| {
public constructor(): R|test/RawOverrides|
public abstract interface A<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun <E : R|kotlin/CharSequence!|> foo(x: R|ft<T & Any, T?>|, y: R|ft<kotlin/collections/MutableList<out ft<T & Any, T?>>, kotlin/collections/List<out ft<T & Any, T?>>?>|): R|ft<E & Any, E?>|
public abstract fun <E : R|kotlin/CharSequence!|> foo(x: R|T!|, y: R|ft<kotlin/collections/MutableList<out T!>, kotlin/collections/List<out T!>?>|): R|E!|
}
public open inner class B : R|kotlin/Any|, R|Raw type test/RawOverrides.A<kotlin/Any!>| {
@@ -12,7 +12,7 @@ public open class RawOverrides : R|kotlin/Any| {
}
public open inner class C : R|kotlin/Any| {
public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|E!|> bar(x: R|F!|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>?>|): R|E!|
public test/RawOverrides.constructor(): R|test/RawOverrides.C|
@@ -20,7 +20,7 @@ public open class RawOverrides : R|kotlin/Any| {
public open inner class D : R|test/RawOverrides.C| {
@R|java/lang/Override|() public open fun bar(x: R|kotlin/CharSequence!|, y: R|ft<Raw type kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/String!|
public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|E!|> bar(x: R|F!|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<E!, F!>, kotlin/collections/Map<E!, F!>?>>?>|): R|E!|
public test/RawOverrides.constructor(): R|test/RawOverrides.D|