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

[FIR] Unwrap captured types in target type of SAM conversion

Browse Source 
^KT-66256 Fixed
This commit is contained in:
Dmitriy Novozhilov
2024-03-01 14:06:27 +02:00
committed by Space Team
parent 690f39b91c
commit b875ae774e
28 changed files with 185 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
+1 -1
View File
@@ -549,7 +549,7 @@ internal class AdapterGenerator(
}
internal fun getFunctionTypeForPossibleSamType(parameterType: ConeKotlinType): ConeKotlinType? {
return samResolver.getFunctionTypeForPossibleSamType(parameterType)
return samResolver.getSamInfoForPossibleSamType(parameterType)?.functionalType
}
/**
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -53661,6 +53661,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/sam/fieldInJavaSamInterface.kt");
}
@Test
@TestMetadata("inProjectedSam.kt")
public void testInProjectedSam() {
runTest("compiler/testData/codegen/box/sam/inProjectedSam.kt");
}
@Test
@TestMetadata("inlinedSamWrapper.kt")
public void testInlinedSamWrapper() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -53661,6 +53661,12 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener
runTest("compiler/testData/codegen/box/sam/fieldInJavaSamInterface.kt");
}
@Test
@TestMetadata("inProjectedSam.kt")
public void testInProjectedSam() {
runTest("compiler/testData/codegen/box/sam/inProjectedSam.kt");
}
@Test
@TestMetadata("inlinedSamWrapper.kt")
public void testInlinedSamWrapper() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -53661,6 +53661,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/sam/fieldInJavaSamInterface.kt");
}
@Test
@TestMetadata("inProjectedSam.kt")
public void testInProjectedSam() {
runTest("compiler/testData/codegen/box/sam/inProjectedSam.kt");
}
@Test
@TestMetadata("inlinedSamWrapper.kt")
public void testInlinedSamWrapper() {