From 9632839253aa3fc62c835668b0f3cd7df4397339 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Tue, 16 Mar 2021 12:28:51 +0300 Subject: [PATCH] [JVM IR] Add jvm box test for KT-45297 --- .../FirBlackBoxCodegenTestGenerated.java | 6 +++ .../delegatedProperty/javaDelegateTopLevel.kt | 40 +++++++++++++++++++ .../codegen/BlackBoxCodegenTestGenerated.java | 6 +++ .../IrBlackBoxCodegenTestGenerated.java | 6 +++ .../LightAnalysisModeTestGenerated.java | 5 +++ 5 files changed, 63 insertions(+) create mode 100644 compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.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 08a730211ba..f3d10b632dc 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 @@ -12750,6 +12750,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt"); } + @Test + @TestMetadata("javaDelegateTopLevel.kt") + public void testJavaDelegateTopLevel() throws Exception { + runTest("compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.kt"); + } + @Test @TestMetadata("kt35707.kt") public void testKt35707() throws Exception { diff --git a/compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.kt b/compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.kt new file mode 100644 index 00000000000..12f034ccbe4 --- /dev/null +++ b/compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.kt @@ -0,0 +1,40 @@ +// TARGET_BACKEND: JVM +// IGNORE_BACKEND_FIR: JVM_IR +// WITH_RUNTIME + +// MODULE: jjj +// FILE: J.java + +public class J { + private String s = "Fail"; + + public void setFoo(String s) { + this.s = s; + } + + public String getFoo() { + return s; + } +} + +// MODULE: lib(jjj) +// FILE: lib.kt +package k + +import J + +var p1 by J()::foo +var p2 by J()::foo + +// MODULE: main(lib) +// FILE: box.kt + +import k.p1 +import k.p2 + +fun box(): String { + p1 = "O" + p2 = "K" + return p1 + p2 +} + 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 353800037c0..56bb29d473e 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 @@ -12750,6 +12750,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt"); } + @Test + @TestMetadata("javaDelegateTopLevel.kt") + public void testJavaDelegateTopLevel() throws Exception { + runTest("compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.kt"); + } + @Test @TestMetadata("kt35707.kt") public void testKt35707() 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 fd088e205e0..e1c7b0efa9a 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 @@ -12750,6 +12750,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt"); } + @Test + @TestMetadata("javaDelegateTopLevel.kt") + public void testJavaDelegateTopLevel() throws Exception { + runTest("compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.kt"); + } + @Test @TestMetadata("kt35707.kt") public void testKt35707() 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 44e26173c3c..2341b2245db 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -10391,6 +10391,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/delegatedProperty/insideInlinedObjectMultiModule.kt"); } + @TestMetadata("javaDelegateTopLevel.kt") + public void testJavaDelegateTopLevel() throws Exception { + runTest("compiler/testData/codegen/box/delegatedProperty/javaDelegateTopLevel.kt"); + } + @TestMetadata("kt35707.kt") public void testKt35707() throws Exception { runTest("compiler/testData/codegen/box/delegatedProperty/kt35707.kt"); -- GitLab