From b03c9b6fc64e3c302e6aa28097c37dad75c35510 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 22 Oct 2021 13:27:25 +0300 Subject: [PATCH] JVM_IR additional tests for indy lambda serialization --- .../FirBlackBoxCodegenTestGenerated.java | 12 ++++++ ...ameInterfaceDifferentCapturedValueTypes.kt | 37 +++++++++++++++++++ .../sameInterfaceDifferentCapturedValues.kt | 37 +++++++++++++++++++ .../serializableBoundInterfaceMemberFunRef.kt | 18 +++++++-- .../codegen/BlackBoxCodegenTestGenerated.java | 12 ++++++ .../IrBlackBoxCodegenTestGenerated.java | 12 ++++++ .../LightAnalysisModeTestGenerated.java | 10 +++++ 7 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt create mode 100644 compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java index 8d7008fe5b5..7b71c7ff4c2 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java @@ -23023,6 +23023,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameImplMethodDifferentInterfaces.kt"); } + @Test + @TestMetadata("sameInterfaceDifferentCapturedValueTypes.kt") + public void testSameInterfaceDifferentCapturedValueTypes() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt"); + } + + @Test + @TestMetadata("sameInterfaceDifferentCapturedValues.kt") + public void testSameInterfaceDifferentCapturedValues() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt"); + } + @Test @TestMetadata("serializableBoundClassMemberFunRef.kt") public void testSerializableBoundClassMemberFunRef() throws Exception { diff --git a/compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt b/compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt new file mode 100644 index 00000000000..76983fe4007 --- /dev/null +++ b/compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt @@ -0,0 +1,37 @@ +// TARGET_BACKEND: JVM +// JVM_TARGET: 1.8 +// SAM_CONVERSIONS: INDY +// FULL_JDK + +// CHECK_BYTECODE_TEXT +// JVM_IR_TEMPLATES +// 4 java/lang/invoke/LambdaMetafactory + +// FILE: sameInterfaceDifferentCapturedValueTypes.kt +import java.io.* + +fun box(): String { + val vks = "K" + val vkc = 'K' + + val t1 = roundtrip(Sam { s -> s + vks }).get("O") + if (t1 != "OK") return "Failed: t1='$t1'" + + val t2 = roundtrip(Sam { s -> s + vkc }).get("O") + if (t2 != "OK") return "Failed: t2='$t2'" + + return "OK" +} + +fun roundtrip(x: T): T { + val out1 = ByteArrayOutputStream() + ObjectOutputStream(out1).writeObject(x) + return ObjectInputStream(ByteArrayInputStream(out1.toByteArray())).readObject() as T +} + +// FILE: Sam.java +import java.io.*; + +public interface Sam extends Serializable { + String get(String s); +} diff --git a/compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt b/compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt new file mode 100644 index 00000000000..e2c5907b08b --- /dev/null +++ b/compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt @@ -0,0 +1,37 @@ +// TARGET_BACKEND: JVM +// JVM_TARGET: 1.8 +// SAM_CONVERSIONS: INDY +// FULL_JDK + +// CHECK_BYTECODE_TEXT +// JVM_IR_TEMPLATES +// 4 java/lang/invoke/LambdaMetafactory + +// FILE: sameInterfaceDifferentCapturedValues.kt +import java.io.* + +fun box(): String { + val vo = "O" + val vk = "K" + + val t1 = roundtrip(Sam { s -> s + vk }).get("O") + if (t1 != "OK") return "Failed: t1='$t1'" + + val t2 = roundtrip(Sam { s -> vo + s + vk }).get("") + if (t2 != "OK") return "Failed: t2='$t2'" + + return "OK" +} + +fun roundtrip(x: T): T { + val out1 = ByteArrayOutputStream() + ObjectOutputStream(out1).writeObject(x) + return ObjectInputStream(ByteArrayInputStream(out1.toByteArray())).readObject() as T +} + +// FILE: Sam.java +import java.io.*; + +public interface Sam extends Serializable { + String get(String s); +} diff --git a/compiler/testData/codegen/box/invokedynamic/serializable/serializableBoundInterfaceMemberFunRef.kt b/compiler/testData/codegen/box/invokedynamic/serializable/serializableBoundInterfaceMemberFunRef.kt index 3b5401cdf38..22a6ca1ab92 100644 --- a/compiler/testData/codegen/box/invokedynamic/serializable/serializableBoundInterfaceMemberFunRef.kt +++ b/compiler/testData/codegen/box/invokedynamic/serializable/serializableBoundInterfaceMemberFunRef.kt @@ -5,7 +5,7 @@ // CHECK_BYTECODE_TEXT // JVM_IR_TEMPLATES -// 2 java/lang/invoke/LambdaMetafactory +// 3 java/lang/invoke/LambdaMetafactory // FILE: serializableBoundInterfaceMemberFunRef.kt import java.io.* @@ -18,10 +18,20 @@ class C(val s: String) : Plus, Serializable { override fun plus(ss: String) = ss + s } +class K : Plus, Serializable { + override fun plus(ss: String) = ss + "K" +} + fun box(): String { - val p: Plus = C("K") - return roundtrip(Sam(p::plus)) - .get("O") + val p1: Plus = C("K") + val t1 = roundtrip(Sam(p1::plus)).get("O") + if (t1 != "OK") return "Failed: t1='$t1'" + + val p2: Plus = K() + val t2 = roundtrip(Sam(p2::plus)).get("O") + if (t2 != "OK") return "Failed: t2='$t2'" + + return "OK" } fun roundtrip(x: T): T { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 8a7c74cb4ae..1a384d826ae 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -22885,6 +22885,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameImplMethodDifferentInterfaces.kt"); } + @Test + @TestMetadata("sameInterfaceDifferentCapturedValueTypes.kt") + public void testSameInterfaceDifferentCapturedValueTypes() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt"); + } + + @Test + @TestMetadata("sameInterfaceDifferentCapturedValues.kt") + public void testSameInterfaceDifferentCapturedValues() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt"); + } + @Test @TestMetadata("serializableBoundClassMemberFunRef.kt") public void testSerializableBoundClassMemberFunRef() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 8d8a79f287b..3a741203d3d 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -23023,6 +23023,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameImplMethodDifferentInterfaces.kt"); } + @Test + @TestMetadata("sameInterfaceDifferentCapturedValueTypes.kt") + public void testSameInterfaceDifferentCapturedValueTypes() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt"); + } + + @Test + @TestMetadata("sameInterfaceDifferentCapturedValues.kt") + public void testSameInterfaceDifferentCapturedValues() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt"); + } + @Test @TestMetadata("serializableBoundClassMemberFunRef.kt") public void testSerializableBoundClassMemberFunRef() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index b4360aa2ccb..05b679fdbe1 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -19181,6 +19181,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameImplMethodDifferentInterfaces.kt"); } + @TestMetadata("sameInterfaceDifferentCapturedValueTypes.kt") + public void testSameInterfaceDifferentCapturedValueTypes() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValueTypes.kt"); + } + + @TestMetadata("sameInterfaceDifferentCapturedValues.kt") + public void testSameInterfaceDifferentCapturedValues() throws Exception { + runTest("compiler/testData/codegen/box/invokedynamic/serializable/sameInterfaceDifferentCapturedValues.kt"); + } + @TestMetadata("serializableBoundClassMemberFunRef.kt") public void testSerializableBoundClassMemberFunRef() throws Exception { runTest("compiler/testData/codegen/box/invokedynamic/serializable/serializableBoundClassMemberFunRef.kt");