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

Fix SAM conversion generation condition

Browse Source 
Remove check if array is passed to vararg parameter as it's not
relevant anymore and leads to ^KT-51821.

^KT-51821: Fixed
This commit is contained in:
vladislav.grechko
2023-02-28 18:55:49 +01:00
committed by teamcity
parent c604577132
commit 7033d78641
14 changed files with 82 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -47661,6 +47661,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/sam/kt50477Enabled.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt52417.kt")
public void testKt52417() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -47661,6 +47661,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/sam/kt50477Enabled.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt52417.kt")
public void testKt52417() throws Exception {
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt
+1 -5
View File
@@ -634,10 +634,6 @@ fun StatementGenerator.generateSamConversionForValueArgumentsIfRequired(call: Ca
"Mismatching resolved call arguments:\n" +
"${resolvedCallArguments?.size} != ${underlyingValueParameters.size}"
}
val isArrayAssignedToVararg: Boolean = resolvedCallArguments != null &&
(underlyingValueParameters zip resolvedCallArguments).any { (param, arg) ->
param.isVararg && arg is ResolvedCallArgument.SimpleArgument && arg.callArgument.isArrayOrArrayLiteral()
}
val substitutionContext = call.original.typeArguments.entries.associate { (typeParameterDescriptor, typeArgument) ->
underlyingDescriptor.typeParameters[typeParameterDescriptor.index].typeConstructor to TypeProjectionImpl(typeArgument)
@@ -648,7 +644,7 @@ fun StatementGenerator.generateSamConversionForValueArgumentsIfRequired(call: Ca
val underlyingValueParameter: ValueParameterDescriptor = underlyingValueParameters[i]
val expectedSamConversionTypesForVararg =
if (!isArrayAssignedToVararg && resolvedCall is NewResolvedCallImpl<*>) {
if (resolvedCall is NewResolvedCallImpl<*>) {
val arguments = resolvedCall.valueArguments[originalValueParameters[i]]?.arguments
arguments?.map { resolvedCall.getExpectedTypeForSamConvertedArgument(it) }
} else null
compiler/testData/codegen/box/sam/kt51821.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
fun interface A {
fun f(x: String): String
}
fun foo(a: A, vararg s: String): String =
a.f(s[0])
fun bar(vararg s: String): String =
foo({ it }, s = s)
fun box(): String = bar("OK")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -45471,6 +45471,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/sam/kt50171.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt52417.kt")
public void testKt52417() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -47661,6 +47661,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/sam/kt50477Enabled.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt52417.kt")
public void testKt52417() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -36716,6 +36716,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/sam/kt50171.kt");
}
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@TestMetadata("kt52417.kt")
public void testKt52417() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt52417.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -33965,6 +33965,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/sam/kt17765.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt56188.kt")
public void testKt56188() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -34151,6 +34151,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/sam/kt17765.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt56188.kt")
public void testKt56188() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -34151,6 +34151,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/sam/kt17765.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt56188.kt")
public void testKt56188() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -34151,6 +34151,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/sam/kt17765.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt56188.kt")
public void testKt56188() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -37692,6 +37692,12 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes
runTest("compiler/testData/codegen/box/sam/kt17765.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt56188.kt")
public void testKt56188() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -37226,6 +37226,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/sam/kt17765.kt");
}
@Test
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@Test
@TestMetadata("kt56188.kt")
public void testKt56188() throws Exception {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -30566,6 +30566,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/sam/kt17765.kt");
}
@TestMetadata("kt51821.kt")
public void testKt51821() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt51821.kt");
}
@TestMetadata("kt56188.kt")
public void testKt56188() throws Exception {
runTest("compiler/testData/codegen/box/sam/kt56188.kt");