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

Safely check for suspend function parent

Browse Source 
The issue here is that the function can be in unlowered file, and
thus its parent package fragment and not class.

 #KT-49317 Fixed
This commit is contained in:
Ilmir Usmanov
2022-04-08 23:31:49 +02:00
parent 3138b29fb2
commit 1e3f84402d
10 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -10179,6 +10179,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/coroutines/kt49168.kt");
}
@Test
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@Test
@TestMetadata("kt49645.kt")
public void testKt49645() throws Exception {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrCoroutineUtils.kt
+2 -2
View File
@@ -38,9 +38,9 @@ private fun IrFunction.isInvokeOfSuspendCallableReference(): Boolean =
&& parentAsClass.origin == JvmLoweredDeclarationOrigin.FUNCTION_REFERENCE_IMPL
private fun IrFunction.isBridgeToSuspendImplMethod(): Boolean =
isSuspend && this is IrSimpleFunction && parentAsClass.functions.any {
isSuspend && this is IrSimpleFunction && (parent as? IrClass)?.functions?.any {
it.name.asString() == name.asString() + SUSPEND_IMPL_NAME_SUFFIX && it.attributeOwnerId == attributeOwnerId
}
} == true
private fun IrFunction.isStaticInlineClassReplacementDelegatingCall(): Boolean {
if (this !is IrAttributeContainer || isStaticInlineClassReplacement) return false
compiler/testData/codegen/box/coroutines/kt49317.kt
Vendored
+26
View File
@@ -0,0 +1,26 @@
// WITH_STDLIB
// FILE: 2.kt
package other
import builders.*
import kotlin.coroutines.*
fun test() {
suspend {
foo { }
}.startCoroutine(Continuation(EmptyCoroutineContext) {
it.getOrThrow()
})
}
fun box(): String {
test()
return "OK"
}
// FILE: 1.kt
package builders
suspend fun foo(
a: suspend () -> Unit = {}
) {}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -10053,6 +10053,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/coroutines/kt49168.kt");
}
@Test
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@Test
@TestMetadata("kt49645.kt")
public void testKt49645() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -10179,6 +10179,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/coroutines/kt49168.kt");
}
@Test
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@Test
@TestMetadata("kt49645.kt")
public void testKt49645() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -7914,6 +7914,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/coroutines/kt46813.kt");
}
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@TestMetadata("kt49645.kt")
public void testKt49645() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49645.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7157,6 +7157,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/kt49168.kt");
}
@Test
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@Test
@TestMetadata("kt51530.kt")
public void testKt51530() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -7199,6 +7199,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/kt49168.kt");
}
@Test
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@Test
@TestMetadata("kt51530.kt")
public void testKt51530() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -6241,6 +6241,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/coroutines/kt49168.kt");
}
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@TestMetadata("kt51530.kt")
public void testKt51530() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt51530.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -8041,6 +8041,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/coroutines/kt49168.kt");
}
@Test
@TestMetadata("kt49317.kt")
public void testKt49317() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/kt49317.kt");
}
@Test
@TestMetadata("kt51530.kt")
public void testKt51530() throws Exception {