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

FIR: Fix loading read-only collection Java types with incorrect variance

Browse Source
This commit is contained in:
Denis.Zharkov
2021-05-28 13:18:01 +03:00
committed by TeamCityServer
parent 5ade831665
commit 18e93b50d9
12 changed files with 66 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
public open class MethodWithMappedClasses : R|kotlin/Any| {
public open fun <T : R|ft<kotlin/Any, kotlin/Any?>|> copy(dest: R|ft<kotlin/collections/MutableList<in ft<T, T?>>, kotlin/collections/List<*>?>|, src: R|ft<kotlin/collections/MutableList<ft<T, T?>>, kotlin/collections/List<ft<T, T?>>?>|): R|kotlin/Unit|
public open fun <T : R|ft<kotlin/Any, kotlin/Any?>|> copy(dest: R|ft<kotlin/collections/MutableList<in ft<T, T?>>, kotlin/collections/MutableList<in ft<T, T?>>?>|, src: R|ft<kotlin/collections/MutableList<ft<T, T?>>, kotlin/collections/List<ft<T, T?>>?>|): R|kotlin/Unit|
public open fun <T : R|ft<kotlin/Any, kotlin/Any?>|> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, *>?>|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T, T?>>?>|): R|kotlin/Unit|
public open fun <T : R|ft<kotlin/Any, kotlin/Any?>|> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in ft<T, T?>>, kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in ft<T, T?>>?>|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T, T?>>?>|): R|kotlin/Unit|
public constructor(): R|test/MethodWithMappedClasses|
compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class MethodWithTypeParameters : R|kotlin/Any| {
public open fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>>?>|> foo(a: R|ft<A, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B, B?>>, kotlin/collections/List<out ft<B, B?>>?>|, list: R|ft<kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<*>?>|): R|kotlin/Unit|
public open fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>>?>|> foo(a: R|ft<A, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B, B?>>, kotlin/collections/List<out ft<B, B?>>?>|, list: R|ft<kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>, kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public constructor(): R|test/MethodWithTypeParameters|