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

[FIR2IR] Unwrap typealiases during applying of suspend conversion

Browse Source 
^KT-65002 Fixed
This commit is contained in:
Dmitriy Novozhilov
2024-02-25 11:09:30 +02:00
committed by Space Team
parent 83ddf904aa
commit 9857bdc891
22 changed files with 131 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
@@ -53232,6 +53232,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -53232,6 +53232,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
+2 -1
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.render
import org.jetbrains.kotlin.fir.resolve.FirSamResolver
import org.jetbrains.kotlin.fir.resolve.calls.FirFakeArgumentForCallableReference
import org.jetbrains.kotlin.fir.resolve.calls.ResolvedCallArgument
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.resolve.substitution.AbstractConeSubstitutor
import org.jetbrains.kotlin.fir.resolve.toFirRegularClassSymbol
import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
@@ -603,7 +604,7 @@ internal class AdapterGenerator(
expectedFunctionalType: ConeClassLikeType,
argument: FirExpression
): IrSimpleFunctionSymbol? {
val argumentType = ((argument as? FirSamConversionExpression)?.expression ?: argument).resolvedType
val argumentType = ((argument as? FirSamConversionExpression)?.expression ?: argument).resolvedType.fullyExpandedType(session)
val argumentTypeWithInvoke = argumentType.findSubtypeOfBasicFunctionType(session, expectedFunctionalType) ?: return null
return if (argumentTypeWithInvoke.isSomeFunctionType(session)) {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -52915,6 +52915,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -52915,6 +52915,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -52973,6 +52973,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// DONT_TARGET_EXACT_BACKEND: JVM
// ISSUE: KT-65002
typealias Listener = (String) -> Unit
fun foo(f: suspend (String) -> Unit): String = "OK"
fun box(): String {
val f: Listener = {}
return foo(f)
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+6
View File
@@ -52283,6 +52283,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -52283,6 +52283,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -52283,6 +52283,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java
Generated
+6
View File
@@ -52225,6 +52225,12 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -42131,6 +42131,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOnVarargElements.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36791,6 +36791,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36791,6 +36791,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36227,6 +36227,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36227,6 +36227,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -40138,6 +40138,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -41158,6 +41158,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -38542,6 +38542,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -39551,6 +39551,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36683,6 +36683,12 @@ public class FirWasmJsCodegenBoxTestGenerated extends AbstractFirWasmJsCodegenBo
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -36119,6 +36119,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionCompatibility.kt");
}
@Test
@TestMetadata("suspendConversionOfAliasedType.kt")
public void testSuspendConversionOfAliasedType() {
runTest("compiler/testData/codegen/box/suspendConversion/suspendConversionOfAliasedType.kt");
}
@Test
@TestMetadata("suspendConversionOnVarargElements.kt")
public void testSuspendConversionOnVarargElements() {