From e36bd5fe90c7e55f93ec96834fe804f5572e470f Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Wed, 6 Jul 2022 12:21:24 +0300 Subject: [PATCH] [box-tests] Added a multi-module box test --- .../FirBlackBoxInlineCodegenTestGenerated.java | 6 ++++++ ...TreeBlackBoxInlineCodegenTestGenerated.java | 6 ++++++ ...KotlinAgainstInlineKotlinTestGenerated.java | 6 ++++++ .../property/reifiedValMultiModule.kt | 18 ++++++++++++++++++ .../BlackBoxInlineCodegenTestGenerated.java | 6 ++++++ ...KotlinAgainstInlineKotlinTestGenerated.java | 6 ++++++ .../IrBlackBoxInlineCodegenTestGenerated.java | 6 ++++++ ...KotlinAgainstInlineKotlinTestGenerated.java | 6 ++++++ ...KotlinAgainstInlineKotlinTestGenerated.java | 6 ++++++ .../JvmIrAgainstOldBoxInlineTestGenerated.java | 6 ++++++ .../JvmOldAgainstIrBoxInlineTestGenerated.java | 6 ++++++ .../js/test/JsCodegenInlineTestGenerated.java | 6 ++++++ .../ir/IrJsCodegenInlineTestGenerated.java | 6 ++++++ .../IrCodegenBoxInlineWasmTestGenerated.java | 5 +++++ .../NativeCodegenBoxTestGenerated.java | 6 ++++++ 15 files changed, 101 insertions(+) create mode 100644 compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java index 6a2144c42a5..d41d7326100 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxInlineCodegenTestGenerated.java @@ -3784,6 +3784,12 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxInlineCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxInlineCodegenTestGenerated.java index b4e4109f916..3ae3168747c 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxInlineCodegenTestGenerated.java @@ -3784,6 +3784,12 @@ public class FirLightTreeBlackBoxInlineCodegenTestGenerated extends AbstractFirL runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java index b91e529a477..550cfe769a7 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3784,6 +3784,12 @@ public class FirSerializeCompileKotlinAgainstInlineKotlinTestGenerated extends A runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt b/compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt new file mode 100644 index 00000000000..7478cfd7873 --- /dev/null +++ b/compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt @@ -0,0 +1,18 @@ +// WITH_STDLIB +// WITH_REFLECT +// MODULE: lib +// FILE: lib.kt +package lib + +inline val T.value: String + get() = T::class.simpleName!! + +// MODULE: main(lib) +// FILE: box.kt +import lib.* + +class OK + +fun box(): String { + return OK().value ?: "fail" +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxInlineCodegenTestGenerated.java index 7645f145f17..69d349ff20c 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxInlineCodegenTestGenerated.java @@ -3784,6 +3784,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java index 2a80ee5086c..92bdf029a15 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3784,6 +3784,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxInlineCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxInlineCodegenTestGenerated.java index e001762caec..5f4a8d98057 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxInlineCodegenTestGenerated.java @@ -3784,6 +3784,12 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrCompileKotlinAgainstInlineKotlinTestGenerated.java index 6222c097971..42c83f83d48 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrCompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3784,6 +3784,12 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java index 621796ce945..b2d754d9143 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSerializeCompileKotlinAgainstInlineKotlinTestGenerated.java @@ -3784,6 +3784,12 @@ public class IrSerializeCompileKotlinAgainstInlineKotlinTestGenerated extends Ab runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxInlineTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxInlineTestGenerated.java index 23f4ff55fc6..e6f5438d58f 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxInlineTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxInlineTestGenerated.java @@ -3784,6 +3784,12 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxInlineTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxInlineTestGenerated.java index 65b450e28a8..50aaf008fa5 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxInlineTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxInlineTestGenerated.java @@ -3784,6 +3784,12 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java index 5753206610a..32965c2e226 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java @@ -3388,6 +3388,12 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest { runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java index f2af89e5a1e..ce8aebcad2f 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenInlineTestGenerated.java @@ -3388,6 +3388,12 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxInlineWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxInlineWasmTestGenerated.java index 7dcccabf3f6..e9eb19e7942 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxInlineWasmTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxInlineWasmTestGenerated.java @@ -3103,6 +3103,11 @@ public class IrCodegenBoxInlineWasmTestGenerated extends AbstractIrCodegenBoxInl runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception { runTest("compiler/testData/codegen/boxInline/property/reifiedVar.kt"); diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index 8c2af2cc3b4..750836f7856 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -42608,6 +42608,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/boxInline/property/reifiedVal.kt"); } + @Test + @TestMetadata("reifiedValMultiModule.kt") + public void testReifiedValMultiModule() throws Exception { + runTest("compiler/testData/codegen/boxInline/property/reifiedValMultiModule.kt"); + } + @Test @TestMetadata("reifiedVar.kt") public void testReifiedVar() throws Exception {