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

[FIR2IR] Fix incorrect type of typealias for suspend functional type, ^KT-50997 Fixed

Browse Source
This commit is contained in:
Ivan Kochurkin
2022-01-28 20:01:40 +03:00
committed by teamcity
parent 828c442518
commit 5391ee91af
10 changed files with 57 additions and 3 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
@@ -44593,6 +44593,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@Test
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@Test
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/InferenceUtils.kt
+6 -3
View File
@@ -107,12 +107,15 @@ fun ConeKotlinType.suspendFunctionTypeToFunctionTypeWithContinuation(session: Fi
if (isKFunctionType(session)) FunctionClassKind.KFunction
else FunctionClassKind.Function
val functionalTypeId = ClassId(kind.packageFqName, kind.numberedClassName(typeArguments.size))
val fullyExpandedType = type.fullyExpandedType(session)
val typeArguments = fullyExpandedType.typeArguments
val lastTypeArgument = typeArguments.last()
return ConeClassLikeTypeImpl(
ConeClassLikeLookupTagImpl(functionalTypeId),
typeArguments = (type.typeArguments.dropLast(1) + ConeClassLikeLookupTagImpl(continuationClassId).constructClassType(
arrayOf(type.typeArguments.last()),
typeArguments = (typeArguments.dropLast(1) + ConeClassLikeLookupTagImpl(continuationClassId).constructClassType(
arrayOf(lastTypeArgument),
isNullable = false
) + type.typeArguments.last()).toTypedArray(),
) + lastTypeArgument).toTypedArray(),
isNullable = false,
attributes = attributes
)
compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
// ISSUE: KT-50997
typealias MySuspendFunction = suspend (String) -> Unit
fun foo(function: MySuspendFunction) {}
fun box() = "OK"
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -44101,6 +44101,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@Test
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@Test
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -44593,6 +44593,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@Test
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@Test
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -35737,6 +35737,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {
runTest("compiler/testData/codegen/box/typealias/innerClassTypeAliasConstructor.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -31851,6 +31851,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@Test
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@Test
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -31953,6 +31953,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@Test
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@Test
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -26719,6 +26719,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {
runTest("compiler/testData/codegen/box/typealias/innerClassTypeAliasConstructor.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/ExternalTestGenerated.java
Generated
+6
View File
@@ -34198,6 +34198,12 @@ public class ExternalTestGenerated extends AbstractExternalNativeBlackBoxTest {
runTest("compiler/testData/codegen/box/typealias/genericTypeAliasConstructor2.kt");
}
@Test
@TestMetadata("incorrectTypeOfTypealiasForSuspendFunctionalType.kt")
public void testIncorrectTypeOfTypealiasForSuspendFunctionalType() throws Exception {
runTest("compiler/testData/codegen/box/typealias/incorrectTypeOfTypealiasForSuspendFunctionalType.kt");
}
@Test
@TestMetadata("innerClassTypeAliasConstructor.kt")
public void testInnerClassTypeAliasConstructor() throws Exception {