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

[FIR] Fix CCE in deserialization of suspend function type with star projection continuation

Browse Source 
#KT-64148 Fixed
This commit is contained in:
Kirill Rakhman
2023-12-13 11:21:15 +01:00
committed by Space Team
parent 01976990e8
commit 6d1ca3d379
21 changed files with 156 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -11216,6 +11216,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -11216,6 +11216,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
+1 -1
View File
@@ -221,7 +221,7 @@ class FirTypeDeserializer(
val continuationType = arguments.getOrNull(arguments.lastIndex - 1) as? ConeClassLikeType ?: return null
if (!continuationType.isContinuation()) return ConeClassLikeTypeImpl(functionTypeConstructor, arguments, isNullable, attributes)
val suspendReturnType = continuationType.typeArguments.single() as ConeKotlinTypeProjection
val suspendReturnType = continuationType.typeArguments.single()
val valueParameters = arguments.dropLast(2)
val kind = FunctionTypeKind.SuspendFunction
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -11157,6 +11157,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -11157,6 +11157,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -11157,6 +11157,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt
Vendored
+42
View File
@@ -0,0 +1,42 @@
// WITH_STDLIB
// WITH_COROUTINES
// IGNORE_BACKEND_K1: JVM, JS_IR, JS_IR_ES6, WASM, NATIVE
// ^Reports FUN_INTERFACE_WITH_SUSPEND_FUNCTION on K1 JVM (non-IR) and fails in backend on others
// MODULE: m1
// FILE: m1.kt
typealias GivenLambda<ParentGivenType, GivenType> =
suspend GivenDSL<ParentGivenType>.() -> GivenType
fun interface GivenDSL<ParentGivenType> {
suspend fun given(): ParentGivenType
}
class GivenDSLHandler(
val lambda: GivenLambda<*, *> = {},
) {
suspend fun run(dsl: GivenDSL<*>): Any? {
return dsl.lambda()
}
}
// MODULE: m2(m1)
// FILE: box.kt
import helpers.*
import kotlin.coroutines.*
fun builder(c: suspend () -> Unit) {
c.startCoroutine(EmptyContinuation)
}
fun box(): String {
var result = "FAIL"
builder {
GivenDSLHandler(
lambda = { result = this.given() as String; null },
).run { "OK" }
}
return result
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -10869,6 +10869,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -11157,6 +11157,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -11157,6 +11157,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -8874,6 +8874,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/dispatchResume.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7905,6 +7905,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7905,6 +7905,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7905,6 +7905,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7905,6 +7905,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -8780,6 +8780,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -8974,6 +8974,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -8586,6 +8586,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -8781,6 +8781,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7881,6 +7881,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7881,6 +7881,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");
}
@Test
@TestMetadata("deserializedSuspendFunctionProperty.kt")
public void testDeserializedSuspendFunctionProperty() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/deserializedSuspendFunctionProperty.kt");
}
@Test
@TestMetadata("dispatchResume.kt")
public void testDispatchResume() throws Exception {