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

K2: don't make T = Type! substitutions for constructors, including SAM

Browse Source 
Without this commit we get some ABI changes and it looks bad.

Related to KT-65596
This commit is contained in:
Mikhail Glukhikh
2024-02-21 13:58:26 +01:00
committed by Space Team
parent 81414d758d
commit 78b6432ced
27 changed files with 159 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/interconnectedGenerics.fir.txt
Vendored
+1 -1
View File
@@ -34,7 +34,7 @@ FILE: Eq.kt
public get(): R|lib/a/A<R, S>|
public open override fun withL(l: R|kotlin/Int|): R|lib/a/C.WithL<R, S>| {
^withL Q|lib/a/C|.R|lib/a/C.MyWithL.MyWithL|<R|R!|, R|S!|>()
^withL Q|lib/a/C|.R|lib/a/C.MyWithL.MyWithL|<R|R|, R|S|>()
}
}
compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// FIR_DUMP
// FILE: samConversionToGeneric.kt
fun test1() = J<String> { x -> x }
compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.fir.txt
Vendored
+43
View File
@@ -0,0 +1,43 @@
FILE: samConversionToGeneric.kt
public final fun test1(): R|J<kotlin/String>| {
^test1 R|/J|<R|kotlin/String|>(<L> = J@fun <anonymous>(x: R|kotlin/String!|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|
}
)
}
public final fun test2(): R|J<kotlin/String!>| {
^test2 R|/J|<R|kotlin/String!|>(<L> = J@fun <anonymous>(x: R|kotlin/String|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|
}
)
}
public final fun test3(): R|kotlin/Unit| {
^test3 Q|H|.R|/H.bar*s|<R|kotlin/String!|>(<L> = SAM(bar@fun <anonymous>(x: R|kotlin/String|): R|kotlin/String!| <inline=NoInline> {
^ R|<local>/x|
}
))
}
public final fun test4(a: R|kotlin/Any|): R|kotlin/Unit| {
(R|<local>/a| as R|J<kotlin/String>|)
Q|H|.R|/H.bar*s|<R|kotlin/String!|>(R|<local>/a|)
}
public final fun test5(a: R|kotlin/Any|): R|kotlin/Unit| {
(R|<local>/a| as R|(kotlin/String) -> kotlin/String|)
Q|H|.R|/H.bar*s|<R|kotlin/String!|>(SAM(R|<local>/a|))
}
public final fun <T> test6(a: R|(T) -> T|): R|kotlin/Unit| {
Q|H|.R|/H.bar*s|<R|T!|>(SAM(R|<local>/a|))
}
public final fun <T> test7(a: R|kotlin/Any|): R|kotlin/Unit| {
(R|<local>/a| as R|(T) -> T|)
Q|H|.R|/H.bar*s|<R|T!|>(SAM(R|<local>/a|))
}
public final fun test8(efn: R|kotlin/String.() -> kotlin/String|): R|J<kotlin/String!>| {
^test8 R|/J|<R|kotlin/String!|>(R|<local>/efn|)
}
public final fun test9(efn: R|kotlin/String.() -> kotlin/String|): R|kotlin/Unit| {
Q|H|.R|/H.bar*s|<R|kotlin/String!|>(SAM(R|<local>/efn|))
}
public final fun test10(fn: R|(kotlin/Int) -> kotlin/String|): R|kotlin/Unit| {
Q|H|.R|/H.bar2x*s|<R|kotlin/Int!|>(SAM(R|<local>/fn|))
}
compiler/testData/diagnostics/tests/samConversions/samConversionToGeneric.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// FIR_DUMP
// FILE: samConversionToGeneric.kt
fun test1() = J<String> { x -> x }