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

KT-52875 Fix extension function literal creation with -Xlambdas=indy

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2022-06-30 13:30:51 +02:00
committed by teamcity
parent 97c542dd76
commit 8a402bcacd
10 changed files with 53 additions and 1 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
@@ -26240,6 +26240,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt");
}
@Test
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@Test
@TestMetadata("lambdaSerializable.kt")
public void testLambdaSerializable() throws Exception {
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/indy/LambdaMetafactoryArguments.kt
+1 -1
View File
@@ -335,7 +335,7 @@ internal class LambdaMetafactoryArgumentsBuilder(
}
val newReference =
if (implFun.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA)
if (implFun.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA || implFun.isAnonymousFunction)
remapExtensionLambda(implFun as IrSimpleFunction, reference)
else
reference
compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// LAMBDAS: INDY
fun appendTo(s: String) =
fun Any?.() = s + this
fun box() = appendTo("O")("K")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -25730,6 +25730,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt");
}
@Test
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@Test
@TestMetadata("lambdaSerializable.kt")
public void testLambdaSerializable() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -26240,6 +26240,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt");
}
@Test
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@Test
@TestMetadata("lambdaSerializable.kt")
public void testLambdaSerializable() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -21673,6 +21673,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/extensionLambda.kt");
}
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@TestMetadata("nestedIndyLambdas.kt")
public void testNestedIndyLambdas() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/nestedIndyLambdas.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -20656,6 +20656,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/invokedynamic/lambdas"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
}
@Test
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/invokedynamic/lambdas/inlineClassInSignature")
@TestDataPath("$PROJECT_ROOT")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -20620,6 +20620,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/invokedynamic/lambdas"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/invokedynamic/lambdas/inlineClassInSignature")
@TestDataPath("$PROJECT_ROOT")
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -18276,6 +18276,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/invokedynamic/lambdas"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
}
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@TestMetadata("compiler/testData/codegen/box/invokedynamic/lambdas/inlineClassInSignature")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -23305,6 +23305,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/invokedynamic/lambdas"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("kt52875.kt")
public void testKt52875() throws Exception {
runTest("compiler/testData/codegen/box/invokedynamic/lambdas/kt52875.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/invokedynamic/lambdas/inlineClassInSignature")
@TestDataPath("$PROJECT_ROOT")