From 7430bfe51876a98f053e3ddd118e7af71e1c2059 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 6 Mar 2020 16:53:15 +0300 Subject: [PATCH] [KLIB] Update test data - mute temporary broken test - add regression test --- .../ir/FirBlackBoxCodegenTestGenerated.java | 5 ++++ .../transitiveClash.kt | 29 +++++++++++++++++++ .../codegen/BlackBoxCodegenTestGenerated.java | 5 ++++ .../LightAnalysisModeTestGenerated.java | 5 ++++ .../ir/IrBlackBoxCodegenTestGenerated.java | 5 ++++ .../IrJsCodegenBoxTestGenerated.java | 5 ++++ .../semantics/JsCodegenBoxTestGenerated.java | 5 ++++ .../clashedInternalDeclarations.kt | 2 +- 8 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java index b63422ca8cc..e3fa3b2dc4b 100644 --- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java @@ -13738,6 +13738,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt"); } + @TestMetadata("transitiveClash.kt") + public void testTransitiveClash() throws Exception { + runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); + } + @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { runTest("compiler/testData/codegen/box/ir/serializationRegressions/useImportedMember.kt"); diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt new file mode 100644 index 00000000000..76ec2f463da --- /dev/null +++ b/compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt @@ -0,0 +1,29 @@ +// EXPECTED_REACHABLE_NODES: 1304 +// IGNORE_BACKEND: JS_IR +// IGNORE_BACKEND: JVM +// IGNORE_BACKEND: JVM_IR +// MODULE: lib1 +// FILE: lib1.kt +package pkg + +fun foo(): String { return "O" } + +// MODULE: lib2(lib1) +// FILE: lib2.kt +package pkg + +fun bar(): String { return foo() + "K" } + +// MODULE: main(lib2) +// FILE: main.kt + +package pkg + +fun foo(): String { return "42" } + +fun box(): String { + + if (foo() != "42") return "FAIL: ${foo()}" + + return bar() +} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index f66a65496c5..8a0bc44b5f7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -14883,6 +14883,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt"); } + @TestMetadata("transitiveClash.kt") + public void testTransitiveClash() throws Exception { + runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); + } + @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { runTest("compiler/testData/codegen/box/ir/serializationRegressions/useImportedMember.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 25071d6f1d2..868662ced4b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -14883,6 +14883,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt"); } + @TestMetadata("transitiveClash.kt") + public void testTransitiveClash() throws Exception { + runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); + } + @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { runTest("compiler/testData/codegen/box/ir/serializationRegressions/useImportedMember.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 8ddb8de864f..59fe159e191 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -13738,6 +13738,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt"); } + @TestMetadata("transitiveClash.kt") + public void testTransitiveClash() throws Exception { + runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); + } + @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { runTest("compiler/testData/codegen/box/ir/serializationRegressions/useImportedMember.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index 512371ba8c5..51d71d4506b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -11898,6 +11898,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt"); } + @TestMetadata("transitiveClash.kt") + public void testTransitiveClash() throws Exception { + runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); + } + @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { runTest("compiler/testData/codegen/box/ir/serializationRegressions/useImportedMember.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index 4865094e69f..2dba388cf79 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -11963,6 +11963,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt"); } + @TestMetadata("transitiveClash.kt") + public void testTransitiveClash() throws Exception { + runTest("compiler/testData/codegen/box/ir/serializationRegressions/transitiveClash.kt"); + } + @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { runTest("compiler/testData/codegen/box/ir/serializationRegressions/useImportedMember.kt"); diff --git a/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt b/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt index e3b25d57f15..7cf84190717 100644 --- a/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt +++ b/js/js.translator/testData/box/multiModule/clashedInternalDeclarations.kt @@ -1,5 +1,5 @@ // EXPECTED_REACHABLE_NODES: 1284 -// KJS_WITH_FULL_RUNTIME +// IGNORE_BACKEND: JS_IR // MODULE: AT // FILE: at.kt