diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt index 6ca9de7e566..906d4693357 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt @@ -26,6 +26,7 @@ object CompilerExecutor { addAll(options) add("-d") add(library.absolutePathString()) + add("-XXLanguage:-SkipStandaloneScriptsInSourceRoots") } try { MockLibraryUtil.runJvmCompiler(commands) @@ -66,4 +67,4 @@ object CompilerExecutor { } } -class LibraryWasNotCompiledDueToExpectedCompilationError : SkipTestException() \ No newline at end of file +class LibraryWasNotCompiledDueToExpectedCompilationError : SkipTestException() diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt index aef93f7c1a4..d13453d44e2 100644 --- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt +++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt @@ -153,7 +153,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() { fun testSimpleScriptLocal() { val messageCollector = TestMessageCollector() val (code, outputs) = compileLocally(messageCollector, File(getSimpleScriptBaseDir(), "script.kts").absolutePath, - "-d", tmpdir.absolutePath, "-Xreport-output-files") + "-d", tmpdir.absolutePath, "-Xreport-output-files", "-Xallow-any-scripts-in-source-roots") Assert.assertEquals(0, code) Assert.assertTrue(outputs.isNotEmpty()) Assert.assertEquals(File(tmpdir, "Script.class").absolutePath, outputs.first().outputFile?.absolutePath) @@ -173,7 +173,8 @@ class CompilerApiTest : KotlinIntegrationTestBase() { try { val (code, outputs) = compileOnDaemon( flagFile, compilerId, daemonJVMOptions, daemonOptions, TestMessageCollector(), - File(getSimpleScriptBaseDir(), "script.kts").absolutePath, "-Xreport-output-files", "-d", tmpdir.absolutePath + File(getSimpleScriptBaseDir(), "script.kts").absolutePath, + "-Xreport-output-files", "-Xallow-any-scripts-in-source-roots", "-d", tmpdir.absolutePath ) Assert.assertEquals(0, code) Assert.assertTrue(outputs.isNotEmpty()) diff --git a/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassMembers.kt b/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassMembers.kt index ef68f1ccd37..128e3c1ecac 100644 --- a/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassMembers.kt +++ b/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassMembers.kt @@ -32,9 +32,9 @@ inline class ReservedMembersMfvc(val x: Int, val y: Int) { inline class SecondaryConstructors(val x: Int) { constructor(y: String) : this(5) - constructor(x: Int, y: String) : this(x) { + constructor(x: Int, y: String) : this(x) { - } + } } value class WithInner(val x: String) { 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 700efd4d511..0a36258a65b 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 @@ -16857,12 +16857,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/enum/noClassForSimpleEnum.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -20426,12 +20420,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -20444,12 +20432,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java index f4a27d405fc..b4babda4544 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java @@ -232,12 +232,6 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest { runTest("compiler/testData/ir/irText/classes/kt43217.kt"); } - @Test - @TestMetadata("kt44013.kt") - public void testKt44013() throws Exception { - runTest("compiler/testData/ir/irText/classes/kt44013.kt"); - } - @Test @TestMetadata("kt45853.kt") public void testKt45853() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java index 98d262180ab..2afa7b9a8bf 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java @@ -232,12 +232,6 @@ public class LightTreeFir2IrTextTestGenerated extends AbstractLightTreeFir2IrTex runTest("compiler/testData/ir/irText/classes/kt43217.kt"); } - @Test - @TestMetadata("kt44013.kt") - public void testKt44013() throws Exception { - runTest("compiler/testData/ir/irText/classes/kt44013.kt"); - } - @Test @TestMetadata("kt45853.kt") public void testKt45853() throws Exception { diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java index b7e61e6389b..774ebf73267 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/AnnotatedParameterInEnumConstructor.java @@ -1,6 +1,9 @@ public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ { A; + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static test.AnnotatedParameterInEnumConstructor valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java index eecad91d232..131e0986387 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/DeprecatedEnumEntry.java @@ -3,6 +3,9 @@ public enum E /* p.E*/ { Entry2, @kotlin.Deprecated(message = "b") Entry3; + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static p.E valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java index b9fb1c14c15..9d59c3e8feb 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/EnumClass.java @@ -1,6 +1,9 @@ public enum MyEnumClass /* one.MyEnumClass*/ { Entry; + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + @org.jetbrains.annotations.NotNull() public static one.MyEnumClass valueOf(java.lang.String) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;// valueOf(java.lang.String) diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java index b93058f0c1c..b28a2ef9f92 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/EnumNameOverride.java @@ -7,5 +7,8 @@ public enum EnumNameOverride /* EnumNameOverride*/ implements Bar { @org.jetbrains.annotations.NotNull() public static EnumNameOverride[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private EnumNameOverride();// .ctor() } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java index b6c84ec8b08..773a516fa8e 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.fir.java @@ -44,6 +44,9 @@ public enum StrangeEnum /* StrangeEnum*/ { @org.jetbrains.annotations.NotNull() public static StrangeEnum[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private StrangeEnum(java.lang.String);// .ctor(java.lang.String) } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java index e4f2c4ab4ce..4bf69cf458f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/strangeIdentifiers.lib.java @@ -44,6 +44,9 @@ public enum StrangeEnum /* StrangeEnum*/ { @org.jetbrains.annotations.NotNull() public static StrangeEnum[] values();// values() + @org.jetbrains.annotations.NotNull() + public static kotlin.enums.EnumEntries getEntries();// getEntries() + private StrangeEnum(java.lang.String);// .ctor(java.lang.String) } diff --git a/compiler/testData/cli/js/jsOldBackend_strict.out b/compiler/testData/cli/js/jsOldBackend_strict.out index f02e8d6ce06..a33af2c6697 100644 --- a/compiler/testData/cli/js/jsOldBackend_strict.out +++ b/compiler/testData/cli/js/jsOldBackend_strict.out @@ -1,3 +1,2 @@ -warning: language version 1.9 is experimental, there are no backwards compatibility guarantees for new language and library features error: old Kotlin/JS compiler is no longer supported. Please migrate to the new JS IR backend COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out b/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out index 58a0033b730..4bb5d5b4b2c 100644 --- a/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out +++ b/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out @@ -1,2 +1,2 @@ -error: language version 1.1 is no longer supported; please, use version 1.3 or greater. +error: language version 1.1 is no longer supported; please, use version 1.4 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index f76bc57a335..1edc185a007 100644 --- a/compiler/testData/cli/jvm/apiVersionInvalid.out +++ b/compiler/testData/cli/jvm/apiVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown API version: 239.42 -Supported API versions: 1.3 (deprecated), 1.4 (deprecated), 1.5, 1.6, 1.7, 1.8, 1.9 (experimental), 2.0 (experimental) +Supported API versions: 1.4 (deprecated), 1.5 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out index 554a1000728..0e547013627 100644 --- a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out +++ b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out @@ -1,4 +1,4 @@ -warning: API version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, ^ diff --git a/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out b/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out index 554a1000728..0e547013627 100644 --- a/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out +++ b/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out @@ -1,4 +1,4 @@ -warning: API version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, ^ diff --git a/compiler/testData/cli/jvm/apiVersionUnsupported.out b/compiler/testData/cli/jvm/apiVersionUnsupported.out index fefaea7f7bc..9fb625249fb 100644 --- a/compiler/testData/cli/jvm/apiVersionUnsupported.out +++ b/compiler/testData/cli/jvm/apiVersionUnsupported.out @@ -1,2 +1,2 @@ -error: API version 1.1 is no longer supported; please, use version 1.3 or greater. +error: API version 1.1 is no longer supported; please, use version 1.4 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/argfileWithEscaping.out b/compiler/testData/cli/jvm/argfileWithEscaping.out index f4def7f9954..dfe742ad6f5 100644 --- a/compiler/testData/cli/jvm/argfileWithEscaping.out +++ b/compiler/testData/cli/jvm/argfileWithEscaping.out @@ -1,6 +1,6 @@ warning: flag is not supported by this version of the compiler: -Xdouble ' quote ' escaped " sequence / warning: flag is not supported by this version of the compiler: -Xsingle " quote " escaped ' sequence / -warning: API version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, ^ diff --git a/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out b/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out index 8a2d8464d6e..e9fa4e495bc 100644 --- a/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out +++ b/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out @@ -1,2 +1,2 @@ -error: language version 1.2 is no longer supported; please, use version 1.3 or greater. +error: language version 1.2 is no longer supported; please, use version 1.4 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/enumEntriesForJavaNotEnabled.out b/compiler/testData/cli/jvm/enumEntriesForJavaNotEnabled.out index 57f855e95a1..1097b3a7fa4 100644 --- a/compiler/testData/cli/jvm/enumEntriesForJavaNotEnabled.out +++ b/compiler/testData/cli/jvm/enumEntriesForJavaNotEnabled.out @@ -7,7 +7,7 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -compiler/testData/cli/jvm/enumEntriesForJavaNotEnabled.kt:4:49: error: the feature "enum entries" is only available since language version 1.9 +compiler/testData/cli/jvm/enumEntriesForJavaNotEnabled.kt:4:49: error: the feature "enum entries" is disabled val entries = java.util.concurrent.TimeUnit.entries ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/enumEntriesNotEnabled.out b/compiler/testData/cli/jvm/enumEntriesNotEnabled.out index 03bc1b2d0b8..f6aeea1de37 100644 --- a/compiler/testData/cli/jvm/enumEntriesNotEnabled.out +++ b/compiler/testData/cli/jvm/enumEntriesNotEnabled.out @@ -7,7 +7,7 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -compiler/testData/cli/jvm/enumEntriesNotEnabled.kt:7:26: error: the feature "enum entries" is only available since language version 1.9 +compiler/testData/cli/jvm/enumEntriesNotEnabled.kt:7:26: error: the feature "enum entries" is disabled val entries = MyEnum.entries ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jspecifyByLv15.out b/compiler/testData/cli/jvm/jspecifyByLv15.out index 7c2a6d77f6e..c472d0bcbfa 100644 --- a/compiler/testData/cli/jvm/jspecifyByLv15.out +++ b/compiler/testData/cli/jvm/jspecifyByLv15.out @@ -1,3 +1,4 @@ +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: type mismatch: inferred type is Nothing? but String was expected a.foo(null) ^ diff --git a/compiler/testData/cli/jvm/jspecifyDefault.out b/compiler/testData/cli/jvm/jspecifyDefault.out index 7c2a6d77f6e..2a911ebf791 100644 --- a/compiler/testData/cli/jvm/jspecifyDefault.out +++ b/compiler/testData/cli/jvm/jspecifyDefault.out @@ -1,7 +1,4 @@ -compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: warning: type mismatch: inferred type is Nothing? but String was expected +compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null can not be a value of a non-null type String a.foo(null) ^ -compiler/testData/cli/jvm/jspecifyUsage.kt:3:5: warning: unsafe use of a nullable receiver of type String? - a.bar().hashCode() - ^ -OK +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/jvmIrByDefault1_5.out b/compiler/testData/cli/jvm/jvmIrByDefault1_5.out index d86bac9de59..be580538bbd 100644 --- a/compiler/testData/cli/jvm/jvmIrByDefault1_5.out +++ b/compiler/testData/cli/jvm/jvmIrByDefault1_5.out @@ -1 +1,2 @@ +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/jvmRecordOk.out b/compiler/testData/cli/jvm/jvmRecordOk.out index 2e80331b53b..48415727fd1 100644 --- a/compiler/testData/cli/jvm/jvmRecordOk.out +++ b/compiler/testData/cli/jvm/jvmRecordOk.out @@ -7,5 +7,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin info: using preview Java language features OK diff --git a/compiler/testData/cli/jvm/jvmRecordWrongTarget.out b/compiler/testData/cli/jvm/jvmRecordWrongTarget.out index 456f06df2b2..8e7f614a135 100644 --- a/compiler/testData/cli/jvm/jvmRecordWrongTarget.out +++ b/compiler/testData/cli/jvm/jvmRecordWrongTarget.out @@ -7,6 +7,7 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/jvmRecord.kt:1:1: error: using @JvmRecord is only allowed with -jvm-target 16 or later (or -jvm-target 15 with the -Xjvm-enable-preview flag enabled) @JvmRecord ^ diff --git a/compiler/testData/cli/jvm/kt48833_doNotSuppressVersionErrors.out b/compiler/testData/cli/jvm/kt48833_doNotSuppressVersionErrors.out index 58b0ae5060d..df6a9b4c477 100644 --- a/compiler/testData/cli/jvm/kt48833_doNotSuppressVersionErrors.out +++ b/compiler/testData/cli/jvm/kt48833_doNotSuppressVersionErrors.out @@ -1,2 +1,2 @@ -error: language version 1.0 is no longer supported; please, use version 1.3 or greater. +error: language version 1.0 is no longer supported; please, use version 1.4 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index 32edb21559f..2e675e61b9d 100644 --- a/compiler/testData/cli/jvm/languageVersionInvalid.out +++ b/compiler/testData/cli/jvm/languageVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown language version: 239.42 -Supported language versions: 1.3 (deprecated), 1.4 (deprecated), 1.5, 1.6, 1.7, 1.8, 1.9 (experimental), 2.0 (experimental) +Supported language versions: 1.4 (deprecated), 1.5 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionUnsupported.out b/compiler/testData/cli/jvm/languageVersionUnsupported.out index 58a0033b730..4bb5d5b4b2c 100644 --- a/compiler/testData/cli/jvm/languageVersionUnsupported.out +++ b/compiler/testData/cli/jvm/languageVersionUnsupported.out @@ -1,2 +1,2 @@ -error: language version 1.1 is no longer supported; please, use version 1.3 or greater. +error: language version 1.1 is no longer supported; please, use version 1.4 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out b/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out index 554a1000728..0e547013627 100644 --- a/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out +++ b/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out @@ -1,4 +1,4 @@ -warning: API version 1.4 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, ^ diff --git a/compiler/testData/cli/jvm/oldBackend.out b/compiler/testData/cli/jvm/oldBackend.out index 553767d843e..ba66f9ce8ab 100644 --- a/compiler/testData/cli/jvm/oldBackend.out +++ b/compiler/testData/cli/jvm/oldBackend.out @@ -1,3 +1,4 @@ warning: language version is automatically inferred to 1.5 when using the old JVM backend. Consider specifying -language-version explicitly, or remove -Xuse-old-backend +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin error: -Xuse-old-backend is no longer supported. Please migrate to the new JVM IR backend COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/oldBackendWithScript.out b/compiler/testData/cli/jvm/oldBackendWithScript.out index 4bc7baa473c..9f8bb16e980 100644 --- a/compiler/testData/cli/jvm/oldBackendWithScript.out +++ b/compiler/testData/cli/jvm/oldBackendWithScript.out @@ -1,3 +1,4 @@ warning: language version is automatically inferred to 1.5 when using the old JVM backend. Consider specifying -language-version explicitly, or remove -Xuse-old-backend +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin warning: -Xuse-old-backend is no longer supported. Please migrate to the new JVM IR backend OK diff --git a/compiler/testData/cli/jvm/progressiveModeOff.out b/compiler/testData/cli/jvm/progressiveModeOff.out index e02fa0abd5a..6aa32675cda 100644 --- a/compiler/testData/cli/jvm/progressiveModeOff.out +++ b/compiler/testData/cli/jvm/progressiveModeOff.out @@ -1,3 +1,4 @@ +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/progressive/tailrecOnVirtualMember.kt:2:5: error: tailrec is not allowed on open members tailrec open fun foo(x: Int) {} ^ diff --git a/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingLv.out b/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingLv.out index 58a0033b730..4bb5d5b4b2c 100644 --- a/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingLv.out +++ b/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingLv.out @@ -1,2 +1,2 @@ -error: language version 1.1 is no longer supported; please, use version 1.3 or greater. +error: language version 1.1 is no longer supported; please, use version 1.4 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/resultInReturnTypeSupportedByDefault15.out b/compiler/testData/cli/jvm/resultInReturnTypeSupportedByDefault15.out index d86bac9de59..be580538bbd 100644 --- a/compiler/testData/cli/jvm/resultInReturnTypeSupportedByDefault15.out +++ b/compiler/testData/cli/jvm/resultInReturnTypeSupportedByDefault15.out @@ -1 +1,2 @@ +warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.asm.ir.txt b/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.asm.ir.txt index 34e03ce6d07..f33bfee8ab9 100644 --- a/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.asm.ir.txt +++ b/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.asm.ir.txt @@ -7,10 +7,14 @@ final class foo/Kotlin$A : foo/Kotlin { Ljava/lang/Enum; public class foo/Kotlin : java/lang/Enum { + private final static kotlin.enums.EnumEntries $ENTRIES + private final static foo.Kotlin[] $VALUES public final static foo.Kotlin A + private final static foo.Kotlin[] $entries() + private final static foo.Kotlin[] $values() static void () diff --git a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt index ba21ac6af3d..9cc0422a7fe 100644 --- a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt +++ b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambda.kt @@ -3,6 +3,7 @@ // IGNORE_BACKEND_K2: JVM_IR // WASM_MUTE_REASON: IGNORED_IN_JS // FIR status: don't support legacy feature. UNINITIALIZED_PARAMETER y. See KT-49800 +// LANGUAGE: -ProhibitIllegalValueParameterUsageInDefaultArguments fun f( f1: () -> String = { f2() }, diff --git a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt index 5fc46c6f2d1..b539b75cf86 100644 --- a/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt +++ b/compiler/testData/codegen/box/defaultArguments/useNextParamInLambdaTailrec.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -ProhibitIllegalValueParameterUsageInDefaultArguments // IGNORE_BACKEND: JVM // IGNORE_BACKEND_K2: JVM_IR, JS_IR, NATIVE // FIR status: don't support legacy feature. UNINITIALIZED_PARAMETER y. See KT-49800 diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.fir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.fir.txt new file mode 100644 index 00000000000..ee58c1bb5da --- /dev/null +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.fir.txt @@ -0,0 +1,40 @@ +@kotlin.Metadata +public final class Delegate { + // source: 'memberExtensionPropertyAndImportFromObject.kt' + public method (): void + public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.String +} + +@kotlin.Metadata +public final enum class E { + // source: 'memberExtensionPropertyAndImportFromObject.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries + private synthetic final static field $VALUES: E[] + public final enum static field X: E + private synthetic final static method $entries(): E[] + private synthetic final static method $values(): E[] + static method (): void + private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries + public static method valueOf(p0: java.lang.String): E + public static method values(): E[] +} + +@kotlin.Metadata +public final class MemberExtensionPropertyAndImportFromObjectKt { + // source: 'memberExtensionPropertyAndImportFromObject.kt' + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + private final static @org.jetbrains.annotations.NotNull field result$delegate: Delegate + static method (): void + public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String + public final static @org.jetbrains.annotations.NotNull method getResult(): java.lang.String +} + +@kotlin.Metadata +public final class O { + // source: 'memberExtensionPropertyAndImportFromObject.kt' + public final static @org.jetbrains.annotations.NotNull field INSTANCE: O + static method (): void + private method (): void + public final @org.jetbrains.annotations.NotNull method getD(@org.jetbrains.annotations.NotNull p0: E): Delegate +} diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.ir.txt index f3a123baadc..b1bab65a2f4 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.ir.txt @@ -8,8 +8,10 @@ public final class Delegate { @kotlin.Metadata public final enum class E { // source: 'memberExtensionPropertyAndImportFromObject.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: E[] public final enum static field X: E + private synthetic final static method $entries(): E[] private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt index 91ad9569b3a..28cb40cfe03 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt @@ -1,5 +1,4 @@ // CHECK_BYTECODE_LISTING -// FIR_IDENTICAL import O.d diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.fir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.fir.txt new file mode 100644 index 00000000000..4549446e826 --- /dev/null +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.fir.txt @@ -0,0 +1,39 @@ +@kotlin.Metadata +public final class Delegate { + // source: 'memberExtensionPropertyAndLocalDelegatedProperty.kt' + public method (): void + public final @org.jetbrains.annotations.NotNull method getValue(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Object): java.lang.String +} + +@kotlin.Metadata +public final enum class E { + // source: 'memberExtensionPropertyAndLocalDelegatedProperty.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries + private synthetic final static field $VALUES: E[] + public final enum static field X: E + private synthetic final static method $entries(): E[] + private synthetic final static method $values(): E[] + static method (): void + private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries + public static method valueOf(p0: java.lang.String): E + public static method values(): E[] +} + +@kotlin.Metadata +public final class MemberExtensionPropertyAndLocalDelegatedPropertyKt { + // source: 'memberExtensionPropertyAndLocalDelegatedProperty.kt' + synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] + static method (): void + private final static method box$lambda$1$lambda$0(p0: Delegate): java.lang.String + public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String +} + +@kotlin.Metadata +public final class O { + // source: 'memberExtensionPropertyAndLocalDelegatedProperty.kt' + public final static @org.jetbrains.annotations.NotNull field INSTANCE: O + static method (): void + private method (): void + public final @org.jetbrains.annotations.NotNull method getD(@org.jetbrains.annotations.NotNull p0: E): Delegate +} diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.ir.txt index 1fee7d4e9ac..1299dcde546 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.ir.txt @@ -8,8 +8,10 @@ public final class Delegate { @kotlin.Metadata public final enum class E { // source: 'memberExtensionPropertyAndLocalDelegatedProperty.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: E[] public final enum static field X: E + private synthetic final static method $entries(): E[] private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt index 07456a1ac94..da75dca67f1 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt @@ -1,5 +1,4 @@ // CHECK_BYTECODE_LISTING -// FIR_IDENTICAL enum class E { X } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt index 1cffb20f649..3a23df23fef 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt @@ -12,12 +12,15 @@ public final class DelegateToEnumKt { @kotlin.Metadata public final enum class E { // source: 'delegateToEnum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: E[] public final enum static field NOT_OK: E public final enum static field OK: E + private synthetic final static method $entries(): E[] private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt index d9b2641f7a6..8a9e6890117 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt @@ -21,12 +21,15 @@ public final class DelegateToEnumInAClassKt { @kotlin.Metadata public final enum class E { // source: 'delegateToEnumInAClass.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: E[] public final enum static field NOT_OK: E public final enum static field OK: E + private synthetic final static method $entries(): E[] private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt index 31291a5aec9..9bc13afb0ca 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt @@ -9,12 +9,15 @@ public final class E$Companion { @kotlin.Metadata public final enum class E { // source: 'withSideEffectsToEnum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: E[] public final static @org.jetbrains.annotations.NotNull field Companion: E$Companion public final enum static field X: E + private synthetic final static method $entries(): E[] private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] public final inner class E$Companion diff --git a/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt b/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt index 0c7a8a4ac75..14258af4cf7 100644 --- a/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt +++ b/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt @@ -1,6 +1,7 @@ // TARGET_BACKEND: JVM // IGNORE_BACKEND_K2: JVM_IR // K2 status: declaringClass is error for enums since Kotlin 1.9 +// LANGUAGE: -ProhibitEnumDeclaringClass package test diff --git a/compiler/testData/codegen/box/enum/objectInEnum.kt b/compiler/testData/codegen/box/enum/objectInEnum.kt deleted file mode 100644 index aea0b5e7e4e..00000000000 --- a/compiler/testData/codegen/box/enum/objectInEnum.kt +++ /dev/null @@ -1,24 +0,0 @@ -// !LANGUAGE: -NestedClassesInEnumEntryShouldBeInner - -enum class E { - ENTRY, - SUBCLASS { - // Because of KT-45115 classes/objects inside enum entries are local in FIR - @Suppress("LOCAL_OBJECT_NOT_ALLOWED") - object O { - fun foo() = 2 - } - override fun bar() = O.foo() - }; - - object O { - fun foo() = 1 - } - open fun bar() = O.foo() -} - -fun box(): String { - if (E.ENTRY.bar() != 1) return "Fail 1" - if (E.SUBCLASS.bar() != 2) return "Fail 2" - return "OK" -} diff --git a/compiler/testData/codegen/box/inference/builderInference/kt50520.kt b/compiler/testData/codegen/box/inference/builderInference/kt50520.kt index 3a2896d94ba..8b95eaa77bc 100644 --- a/compiler/testData/codegen/box/inference/builderInference/kt50520.kt +++ b/compiler/testData/codegen/box/inference/builderInference/kt50520.kt @@ -8,4 +8,4 @@ fun box(): String { add(0, foo) } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt index 67d3eabd2be..077b1c01666 100644 --- a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt +++ b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt @@ -4,7 +4,7 @@ // CHECK_BYTECODE_TEXT // JVM_IR_TEMPLATES -// 1 java/lang/invoke/LambdaMetafactory +// 2 java/lang/invoke/LambdaMetafactory // FILE: enumValues.kt enum class ABC(val x: String = "") { diff --git a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt index de924530c2a..b5073ca13be 100644 --- a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt +++ b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt @@ -4,7 +4,7 @@ // CHECK_BYTECODE_TEXT // JVM_IR_TEMPLATES -// 1 java/lang/invoke/LambdaMetafactory +// 2 java/lang/invoke/LambdaMetafactory // FILE: enumValues.kt enum class ABC(val x: String = "") { diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/companionObjectField.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/companionObjectField.kt index 19c3ee9bd57..c946fc45efc 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/companionObjectField.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/companionObjectField.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB class Class { diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/emptyLhs.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/emptyLhs.kt index ebf386fc70f..4b4065f10bf 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/emptyLhs.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/emptyLhs.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB package test diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/innerSubclass.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/innerSubclass.kt index 9e4dd5f34f7..f4351d392c9 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/innerSubclass.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/innerSubclass.kt @@ -1,4 +1,5 @@ // WITH_STDLIB +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess open class Foo { lateinit var bar: String diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt index afb0a707037..52365f95bb5 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/isInitializedMultiFile.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB // On JVM, isInitialized on a property from another file is forbidden because lateinit-ness is not included in the an ABI of a property. // IGNORE_BACKEND_K1: JVM, JVM_IR diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/nonInlineLambda.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/nonInlineLambda.kt index f196d88cdba..f01bca5cb6d 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/nonInlineLambda.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/nonInlineLambda.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB fun eval(fn: () -> T) = fn() diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/propertyImportedFromObject.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/propertyImportedFromObject.kt index 9762da466f1..79557ce2acc 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/propertyImportedFromObject.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/propertyImportedFromObject.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB // IGNORE_BACKEND: JS, JS_IR_ES6 diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/sideEffects.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/sideEffects.kt index 038ded62b3e..f35e42f3260 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/sideEffects.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/sideEffects.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB class Foo { diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelProperty.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelProperty.kt index cbce561ebf3..7cda3711f92 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelProperty.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelProperty.kt @@ -1,3 +1,4 @@ +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB lateinit var bar: String diff --git a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelPropertyMultiModule.kt b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelPropertyMultiModule.kt index 84832b6a2af..8aa98c25b00 100644 --- a/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelPropertyMultiModule.kt +++ b/compiler/testData/codegen/box/properties/lateinit/isInitializedAndDeinitialize/topLevelPropertyMultiModule.kt @@ -1,4 +1,5 @@ // TARGET_BACKEND: NATIVE +// LANGUAGE: -NativeJsProhibitLateinitIsInitalizedIntrinsicWithoutPrivateAccess // WITH_STDLIB // MODULE: lib diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt index 613ab4554b1..07e2d00ddf3 100644 --- a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt +++ b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt @@ -1,13 +1,16 @@ @kotlin.Metadata public final enum class Test { // source: 'deprecatedEnumEntryFields.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: Test[] public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY1: Test public final enum static field ENTRY2: Test public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY3: Test + private synthetic final static method $entries(): Test[] private synthetic final static method $values(): Test[] static method (): void private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): Test public static method values(): Test[] } diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/hidden.txt b/compiler/testData/codegen/bytecodeListing/deprecated/hidden.txt index d97e2a0e5dd..0eec0544365 100644 --- a/compiler/testData/codegen/bytecodeListing/deprecated/hidden.txt +++ b/compiler/testData/codegen/bytecodeListing/deprecated/hidden.txt @@ -9,7 +9,7 @@ public class Base { public final class Derived { // source: 'hidden.kt' public synthetic deprecated @kotlin.Deprecated(message="", level=HIDDEN) method (): void - public synthetic method f(): void + public method f(): void } @kotlin.Metadata diff --git a/compiler/testData/codegen/bytecodeListing/enum.ir.txt b/compiler/testData/codegen/bytecodeListing/enum.ir.txt index 211668e3b96..6fe72f22b86 100644 --- a/compiler/testData/codegen/bytecodeListing/enum.ir.txt +++ b/compiler/testData/codegen/bytecodeListing/enum.ir.txt @@ -7,10 +7,12 @@ public annotation class Ann { @kotlin.Metadata public final enum class SimpleEnum { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: SimpleEnum[] public final enum static field A: SimpleEnum public final enum static field B: SimpleEnum public final enum static field C: SimpleEnum + private synthetic final static method $entries(): SimpleEnum[] private synthetic final static method $values(): SimpleEnum[] static method (): void private method (p0: java.lang.String, p1: int): void @@ -21,9 +23,11 @@ public final enum class SimpleEnum { @kotlin.Metadata public final enum class WithAnnotations { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: WithAnnotations[] public final enum static @Ann field A: WithAnnotations public final enum static @Ann field B: WithAnnotations + private synthetic final static method $entries(): WithAnnotations[] private synthetic final static method $values(): WithAnnotations[] static method (): void private method (p0: java.lang.String, p1: int): void @@ -34,11 +38,13 @@ public final enum class WithAnnotations { @kotlin.Metadata public final enum class WithConstructor { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: WithConstructor[] public final enum static field A: WithConstructor public final enum static field B: WithConstructor public final enum static field C: WithConstructor private final @org.jetbrains.annotations.NotNull field x: java.lang.String + private synthetic final static method $entries(): WithConstructor[] private synthetic final static method $values(): WithConstructor[] static method (): void private method (p0: java.lang.String, p1: int, p2: java.lang.String): void @@ -58,9 +64,11 @@ final class WithEntryClass$A { @kotlin.Metadata public abstract enum class WithEntryClass { // source: 'enum.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: WithEntryClass[] public final enum static field A: WithEntryClass final inner class WithEntryClass$A + private synthetic final static method $entries(): WithEntryClass[] private synthetic final static method $values(): WithEntryClass[] static method (): void private method (p0: java.lang.String, p1: int): void diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt index 0b81a29abc8..95028a19009 100644 --- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt +++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt @@ -30,9 +30,11 @@ public class TestBasic { @kotlin.Metadata public final enum class TestEnum { // source: 'inlineClassTypeParametersInConstructor.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: TestEnum[] public final enum static field ANSWER: TestEnum private final field z: int + private synthetic final static method $entries(): TestEnum[] private synthetic final static method $values(): TestEnum[] static method (): void private method (p0: java.lang.String, p1: int, p2: int): void diff --git a/compiler/testData/codegen/bytecodeListing/kt55769.ir.txt b/compiler/testData/codegen/bytecodeListing/kt55769.ir.txt index e99de99760b..32d3a7a1f46 100644 --- a/compiler/testData/codegen/bytecodeListing/kt55769.ir.txt +++ b/compiler/testData/codegen/bytecodeListing/kt55769.ir.txt @@ -7,10 +7,12 @@ public final enum class A$B$C { public final enum static field C2: A$B$C public final enum static field C3: A$B$C private synthetic final static field $VALUES: A$B$C[] + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private method (p0: java.lang.String, p1: int): void public static method values(): A$B$C[] public static method valueOf(p0: java.lang.String): A$B$C private synthetic final static method $values(): A$B$C[] + private synthetic final static method $entries(): A$B$C[] static method (): void } diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv15.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv16.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv15.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv16.kt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library15/inlineClass.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library16/inlineClass.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library15/inlineClass.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library16/inlineClass.kt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output15.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output15.txt deleted file mode 100644 index a0aba9318ad..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output15.txt +++ /dev/null @@ -1 +0,0 @@ -OK \ No newline at end of file diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output16.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output16.txt new file mode 100644 index 00000000000..d86bac9de59 --- /dev/null +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output16.txt @@ -0,0 +1 @@ +OK diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt index d039f53b5f2..dbff9ecda7b 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/output.txt @@ -1,37 +1,37 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.8. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.9. This declaration is only supported since Kotlin 42.33 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.9 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:13: error: 'A' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.9 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.8. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.9. This declaration is only supported since Kotlin 42.33 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.9 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:3:17: error: 'typealias TA = String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.9 fun test(a: A): TA { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.8. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.9. This declaration is only supported since Kotlin 42.33 f() ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.9 f() ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:4:5: error: 'f(): Unit' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.9 f() ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.8. This declaration is only supported since Kotlin 42.33 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 42.33 and cannot be used in Kotlin 1.9. This declaration is only supported since Kotlin 42.33 return p ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 40.34 and cannot be used in Kotlin 1.9 return p ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlin/source.kt:5:12: error: 'p: String' is only available since Kotlin 45.35 and cannot be used in Kotlin 1.9 return p ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt index af3804cc3a9..31023f4833a 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/output.txt @@ -1,7 +1,7 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.9 fun test(a: Outer.Nested) { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClasses/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.9 a.f() ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt index 84c313ae9ed..ca606044167 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/output.txt @@ -1,7 +1,7 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.9 fun test(a: Outer.Nested) { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesAgainst14Js/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.9 a.f() ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt index 08acd72636d..4cac4269b82 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/output.txt @@ -1,7 +1,7 @@ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:3:19: error: 'Nested' is only available since Kotlin 1.44 and cannot be used in Kotlin 1.9 fun test(a: Outer.Nested) { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.8 +compiler/testData/compileKotlinAgainstCustomBinaries/requireKotlinInNestedClassesJs/source.kt:4:7: error: 'f(): Unit' is only available since Kotlin 1.88 and cannot be used in Kotlin 1.9 a.f() ^ COMPILATION_ERROR diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt index 3ad212f2cbd..d98b48619d8 100644 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt +++ b/compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/output.txt @@ -1,24 +1,25 @@ error: incompatible classes were found in dependencies. Remove them from the classpath or use '-Xskip-metadata-version-check' to suppress errors -$TMP_DIR$/library.jar!/META-INF/main.kotlin_module: error: module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.9.0, expected version is $ABI_VERSION$. -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:3:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 1.9.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:3:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 2.0.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class fun test(c: C) { ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:4:5: error: unresolved reference: f +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:4:5: error: class 'a.AKt' was compiled with an incompatible version of Kotlin. The actual metadata version is 2.0.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. +The class is loaded from $TMP_DIR$/library.jar!/a/AKt.class f() ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:5:5: error: unresolved reference: v +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:5:5: error: class 'a.AKt' was compiled with an incompatible version of Kotlin. The actual metadata version is 2.0.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. +The class is loaded from $TMP_DIR$/library.jar!/a/AKt.class v ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:5: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 1.9.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:5: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 2.0.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class c.let { C() } ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:7: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 1.9.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:7: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 2.0.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class c.let { C() } ^ -compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 1.9.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. +compiler/testData/compileKotlinAgainstCustomBinaries/strictMetadataVersionSemanticsOldVersion/source.kt:6:13: error: class 'a.C' was compiled with an incompatible version of Kotlin. The actual metadata version is 2.0.0, but the compiler version $ABI_VERSION$ can read versions up to $ABI_VERSION$. The class is loaded from $TMP_DIR$/library.jar!/a/C.class c.let { C() } ^ diff --git a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt index 685ae6d9ba4..caff8c330c8 100644 --- a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt +++ b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt @@ -15,13 +15,13 @@ val z = 3 fun foo(x: Int = y, y: Int = x, i : Int = z): Int = x + y -fun foo(x: () -> Int = { y }, y: Int = x(), i : Int = z): Int = x() + y +fun foo(x: () -> Int = { y }, y: Int = x(), i : Int = z): Int = x() + y -fun bar(x: () -> Int = { y; 1 }, y: Int) {} +fun bar(x: () -> Int = { y; 1 }, y: Int) {} fun baz( x: () -> Int = { - fun bar(xx: () -> Int = { y; 1 }) = xx + fun bar(xx: () -> Int = { y; 1 }) = xx bar()() }, y: Int @@ -30,7 +30,7 @@ fun baz( fun boo( x: () -> Int = { - fun bar(): Int = y + fun bar(): Int = y bar() }, y: Int diff --git a/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.fir.kt b/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.fir.kt index b85e740c827..140ff3919a6 100644 --- a/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.fir.kt +++ b/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.fir.kt @@ -7,7 +7,7 @@ fun foo(a: (String) -> Unit) { interface A : (String) -> Unit {} typealias AliasedEFT = ExtensionFunctionType -fun foo(a: @AliasedEFT A) { +fun foo(a: @AliasedEFT A) { // @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic. // Only kotlin.Function{n} type annotated with @Extension should "".a() diff --git a/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt b/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt index 958f015a75a..b742d3ccb3c 100644 --- a/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt +++ b/compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt @@ -7,7 +7,7 @@ fun foo(a: (String) -> Unit) { interface A : (String) -> Unit {} typealias AliasedEFT = ExtensionFunctionType -fun foo(a: @AliasedEFT A) { +fun foo(a: @AliasedEFT A) { // @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic. // Only kotlin.Function{n} type annotated with @Extension should "".a() diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt49276.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/kt49276.fir.kt deleted file mode 100644 index 0f64837b43c..00000000000 --- a/compiler/testData/diagnostics/tests/checkArguments/kt49276.fir.kt +++ /dev/null @@ -1,43 +0,0 @@ -// WITH_STDLIB - -fun SmartList(x: E) {} -fun SmartList(x: Collection) {} - -fun append(x: Any?) {} -fun append(x: Collection<*>) {} - -fun append2(x: Iterable<*>) {} -fun append2(x: Collection<*>) {} - -class In(x: T) - -@JvmName("append31") -fun append3(x: In) {} -fun append3(x: In>) {} - -fun append4(x: E) {} -fun > append4(x: E) {} - -fun takes(range: T) {} -fun takes(range: T) where T : Collection<*>, T: ClosedRange<*> {} - -fun main() { - SmartList(1..2) // warning - SmartList(1..10) // no warning - - append(1..10) // warning - append((1..10) as Any) // no warning - append((1..10) as Iterable) // no warning - append("a".."z") // no warning, the range is not iterable - append(1.0..2.0) - - append2(1..10) // no warning - - append3(In(1..10)) // no warning - - append4(1..10) // warning - - append4(1..10) // warning - - takes(1..10) // warning -} diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt49276.kt b/compiler/testData/diagnostics/tests/checkArguments/kt49276.kt index 5ff36331970..ef0fc8f86c1 100644 --- a/compiler/testData/diagnostics/tests/checkArguments/kt49276.kt +++ b/compiler/testData/diagnostics/tests/checkArguments/kt49276.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // WITH_STDLIB fun SmartList(x: E) {} @@ -22,10 +23,10 @@ fun takes(range: T) {} fun takes(range: T) where T : Collection<*>, T: ClosedRange<*> {} fun main() { - SmartList(1..2) // warning + SmartList(1..2) // warning SmartList(1..10) // no warning - append(1..10) // warning + append(1..10) // warning append((1..10) as Any) // no warning append((1..10) as Iterable) // no warning append("a".."z") // no warning, the range is not iterable @@ -35,9 +36,9 @@ fun main() { append3(In(1..10)) // no warning - append4(1..10) // warning + append4(1..10) // warning append4(1..10) // warning - takes(1..10) // warning + takes(1..10) // warning } diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt49276Error.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/kt49276Error.fir.kt deleted file mode 100644 index dfa365cf9ba..00000000000 --- a/compiler/testData/diagnostics/tests/checkArguments/kt49276Error.fir.kt +++ /dev/null @@ -1,37 +0,0 @@ -// WITH_STDLIB -// !LANGUAGE: +ProgressionsChangingResolve - -fun SmartList(x: E) {} -fun SmartList(x: Collection) {} - -fun append(x: Any?) {} -fun append(x: Collection<*>) {} - -fun append2(x: Iterable<*>) {} -fun append2(x: Collection<*>) {} - -class In(x: T) - -@JvmName("append31") -fun append3(x: In) {} -fun append3(x: In>) {} - -fun append4(x: E) {} -fun > append4(x: E) {} - -fun main() { - SmartList(1..2) // warning - SmartList(1..10) // no warning - - append(1..10) // warning - append((1..10) as Any) // no warning - append((1..10) as Iterable) // no warning - append("a".."z") // no warning, the range is not iterable - append(1.0..2.0) - - append2(1..10) // no warning - - append3(In(1..10)) // no warning - - append4(1..10) // warning -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt49276Error.kt b/compiler/testData/diagnostics/tests/checkArguments/kt49276Error.kt index 5f9e35d1217..feecaef7d23 100644 --- a/compiler/testData/diagnostics/tests/checkArguments/kt49276Error.kt +++ b/compiler/testData/diagnostics/tests/checkArguments/kt49276Error.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // WITH_STDLIB // !LANGUAGE: +ProgressionsChangingResolve @@ -20,10 +21,10 @@ fun append4(x: E) {} fun > append4(x: E) {} fun main() { - SmartList( SmartList(x: Collection): Unit")!>1..2) // warning + SmartList(1..2) // warning SmartList(1..10) // no warning - append(): Unit")!>1..10) // warning + append(1..10) // warning append((1..10) as Any) // no warning append((1..10) as Iterable) // no warning append("a".."z") // no warning, the range is not iterable @@ -33,5 +34,5 @@ fun main() { append3(In(1..10)) // no warning - append4(> append4(x: E): Unit")!>1..10) // warning + append4(1..10) // warning } diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt51062.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/kt51062.fir.kt deleted file mode 100644 index d63df4215b0..00000000000 --- a/compiler/testData/diagnostics/tests/checkArguments/kt51062.fir.kt +++ /dev/null @@ -1,53 +0,0 @@ -// WITH_STDLIB -// FULL_JDK - -// FILE: JavaSmartList.java -import kotlin.ranges.ClosedRange; - -import java.util.Collection; - -public class JavaSmartList { - JavaSmartList(E x) {} - JavaSmartList(Collection x) {} - - static void append(Object x) {} - static void append(Collection x) {} - - static void append2(Iterable x) {} - static void append2(Collection x) {} - - public static class In { - In(T x) {} - } - - static void append3(In x) {} - static void append3(In> x) {} - - static void append4(E x) {} - static > void append4(E x) {} - - static void takes(T x) {} - static & ClosedRange> void takes(T x) {} -} - -// FILE: main.kt -fun main() { - JavaSmartList(1..2) // warning - JavaSmartList(1..10) // no warning - - JavaSmartList.append(1..10) // warning - JavaSmartList.append((1..10) as Any) // no warning - JavaSmartList.append((1..10) as Iterable) // no warning - JavaSmartList.append("a".."z") // no warning, the range is not iterable - JavaSmartList.append(1.0..2.0) - - JavaSmartList.append2(1..10) // no warning - - JavaSmartList.append3(JavaSmartList.In(1..10)) // no warning - - JavaSmartList.append4(1..10) // warning - - JavaSmartList.append4(1..10) // warning - - JavaSmartList.takes(1..10) // warning -} diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt51062.kt b/compiler/testData/diagnostics/tests/checkArguments/kt51062.kt index 2d89973bfc2..233a082a146 100644 --- a/compiler/testData/diagnostics/tests/checkArguments/kt51062.kt +++ b/compiler/testData/diagnostics/tests/checkArguments/kt51062.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // WITH_STDLIB // FULL_JDK @@ -32,10 +33,10 @@ public class JavaSmartList { // FILE: main.kt fun main() { - JavaSmartList(1..2) // warning + JavaSmartList(1..2) // warning JavaSmartList(1..10) // no warning - JavaSmartList.append(1..10) // warning + JavaSmartList.append(1..10) // warning JavaSmartList.append((1..10) as Any) // no warning JavaSmartList.append((1..10) as Iterable) // no warning JavaSmartList.append("a".."z") // no warning, the range is not iterable @@ -45,9 +46,9 @@ fun main() { JavaSmartList.append3(JavaSmartList.In(1..10)) // no warning - JavaSmartList.append4(1..10) // warning + JavaSmartList.append4(1..10) // warning JavaSmartList.append4(1..10) // warning - JavaSmartList.takes(1..10) // warning + JavaSmartList.takes(1..10) // warning } diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedEnumCompanionVals.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedEnumCompanionVals.kt index 86fea59ebe5..8a73c99b1b9 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedEnumCompanionVals.kt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedEnumCompanionVals.kt @@ -1,7 +1,7 @@ // SKIP_TXT enum class A(val z: Any) { - Y(x); + Y(x); companion object { val x = A.Y.ordinal @@ -9,7 +9,7 @@ enum class A(val z: Any) { } enum class B(val z: Any) { - Y(B.x); + Y(B.x); companion object { val x = B.Y.ordinal diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.kt index 18e5504c905..165a9a65c4c 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.kt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.kt @@ -9,7 +9,7 @@ enum class B(val x: Int) { } enum class C(val x: Int) { - C1(SUM), + C1(SUM), C2(1); companion object { @@ -32,8 +32,8 @@ enum class Fruit(personal: Int) { // Another example from KT-11769 enum class EnumCompanion1(val x: Int) { - INSTANCE(Companion.foo()), - ANOTHER(foo()); + INSTANCE(Companion.foo()), + ANOTHER(foo()); companion object { fun foo() = 42 @@ -41,7 +41,7 @@ enum class EnumCompanion1(val x: Int) { } // Also should be reported for implicit receiver enum class EnumCompanion2(val x: Int) { - INSTANCE(foo()); + INSTANCE(foo()); companion object { fun foo() = 42 diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/kt48546.kt b/compiler/testData/diagnostics/tests/delegatedProperty/kt48546.kt index 83ca2c5c8e9..d1be6993125 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/kt48546.kt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/kt48546.kt @@ -4,7 +4,7 @@ object DelegateTest { var result = "" val f by lazy { - result += f.toString() // Compiler crash + result += f.toString() // Compiler crash "hello" } } @@ -12,7 +12,7 @@ object DelegateTest { object DelegateTest2 { var result = "" val f by lazy { - result += f + result += f "hello" } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt index 9e28c4bfa10..a85581e4f19 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt @@ -3,12 +3,12 @@ import kotlin.reflect.KProperty -val a by a +val a by a val b by Delegate(b) val c by d -val d by c +val d by c class Delegate(i: Int) { operator fun getValue(t: Any?, p: KProperty<*>): Int { diff --git a/compiler/testData/diagnostics/tests/delegation/kt48546.kt b/compiler/testData/diagnostics/tests/delegation/kt48546.kt index caf4554a7b5..cf86b758374 100644 --- a/compiler/testData/diagnostics/tests/delegation/kt48546.kt +++ b/compiler/testData/diagnostics/tests/delegation/kt48546.kt @@ -3,7 +3,7 @@ object DelegateTest { var result = "" val f by lazy { - result += f.toString() // Compiler crash + result += f.toString() // Compiler crash "hello" } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt index 94b67d09af7..4a34a35d2ee 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt @@ -1,3 +1,3 @@ package typeReferenceError -class Pair<:(val c: fun main() +class Pair<:(val c: fun main() diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.diag.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.diag.txt index b8ba78cd71b..16e80d95440 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.diag.txt @@ -1,12 +1,4 @@ -/kt47986Default.kt:4:18: warning: parameter 'builderAction' is never used -fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() - ^ -/kt47986Default.kt:6:20: warning: parameter 'x' is never used -fun Foo.bar(x: Int = 1) {} - ^ -/kt47986Default.kt:9:9: warning: variable 'x' is never used - val x = buildFoo { - ^ -/kt47986Default.kt:9:13: warning: type parameter for a type argument K can't be inferred into declared upper bounds. Please provide any use-site type information. It will become an error in future releases. +/kt47986Default.kt:10:13: error: not enough information to infer type variable K val x = buildFoo { ^ + diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.fir.kt deleted file mode 100644 index 8c003d5c18c..00000000000 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// !RENDER_DIAGNOSTICS_FULL_TEXT -class Foo - -fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() - -fun Foo.bar(x: Int = 1) {} - -fun main() { - val x = buildFoo { - bar() - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.kt index 267a0a94885..3d4024548c5 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986Default.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !RENDER_DIAGNOSTICS_FULL_TEXT class Foo @@ -6,7 +7,7 @@ fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() fun Foo.bar(x: Int = 1) {} fun main() { - val x = buildFoo { + val x = buildFoo { bar() } } diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.diag.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.diag.txt index d2339039b6b..1ab90ac25bf 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.diag.txt @@ -1,12 +1,4 @@ -/kt47986_2.kt:4:18: warning: parameter 'builderAction' is never used -fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() - ^ -/kt47986_2.kt:11:9: warning: variable 'x' is never used - val x = buildFoo { // can't infer - ^ -/kt47986_2.kt:11:13: warning: type parameter for a type argument K can't be inferred into declared upper bounds. Please provide any use-site type information. It will become an error in future releases. +/kt47986_2.kt:12:13: error: not enough information to infer type variable K val x = buildFoo { // can't infer ^ -/kt47986_2.kt:12:13: warning: variable 'y' is never used - val y = id(::bar) - ^ + diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.fir.kt deleted file mode 100644 index c0ab24adb83..00000000000 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.fir.kt +++ /dev/null @@ -1,14 +0,0 @@ -// !RENDER_DIAGNOSTICS_FULL_TEXT -class Foo - -fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() - -fun Foo.bar() {} - -fun id(x: K) = x - -fun main() { - val x = buildFoo { // can't infer - val y = id(::bar) - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.kt index 882956d5593..9610d6406e0 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_2.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !RENDER_DIAGNOSTICS_FULL_TEXT class Foo @@ -8,7 +9,7 @@ fun Foo.bar() {} fun id(x: K) = x fun main() { - val x = buildFoo { // can't infer + val x = buildFoo { // can't infer val y = id(::bar) } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.diag.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.diag.txt index 5eefeaec1f0..110c49b7e5f 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.diag.txt @@ -1,12 +1,4 @@ -/kt47986_3.kt:4:18: warning: parameter 'builderAction' is never used -fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() - ^ -/kt47986_3.kt:6:26: warning: parameter 'x' is never used -fun Foo.bar(x: Int = 1) {} - ^ -/kt47986_3.kt:9:9: warning: variable 'x' is never used - val x = buildFoo { - ^ -/kt47986_3.kt:9:13: warning: type parameter for a type argument K can't be inferred into declared upper bounds. Please provide any use-site type information. It will become an error in future releases. +/kt47986_3.kt:10:13: error: not enough information to infer type variable K val x = buildFoo { ^ + diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.fir.kt deleted file mode 100644 index 2250acf7373..00000000000 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// !RENDER_DIAGNOSTICS_FULL_TEXT -class Foo - -fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() - -fun Foo.bar(x: Int = 1) {} - -fun main() { - val x = buildFoo { - bar() - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.kt index 7a422bd3566..c643c2ee6fc 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt47986_3.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !RENDER_DIAGNOSTICS_FULL_TEXT class Foo @@ -6,7 +7,7 @@ fun buildFoo(builderAction: Foo.() -> Unit): Foo = Foo() fun Foo.bar(x: Int = 1) {} fun main() { - val x = buildFoo { + val x = buildFoo { bar() } } diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.diag.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.diag.txt index 73d249e66cd..788321964a2 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.diag.txt @@ -1,12 +1,4 @@ -/kt51464.kt:2:16: warning: parameter 'value' is never used -fun flowOf(value: T): Flow = TODO() - ^ -/kt51464.kt:8:30: warning: parameter 'transform' is never used -fun Flow.transform(transform: FlowCollector.(T) -> Unit): Flow = TODO() - ^ -/kt51464.kt:11:20: warning: parameter 'collector' is never used - fun doEmit(collector: FlowCollector) {} - ^ -/kt51464.kt:12:15: warning: type parameter for a type argument R can't be inferred into declared upper bounds. Please provide any use-site type information. It will become an error in future releases. +/kt51464.kt:13:15: error: not enough information to infer type variable R flowOf(1).transform { doEmit(this) } ^ + diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.fir.kt deleted file mode 100644 index 82f0c40f1ea..00000000000 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -// !RENDER_DIAGNOSTICS_FULL_TEXT -fun flowOf(value: T): Flow = TODO() - -interface FlowCollector {} - -interface Flow - -fun Flow.transform(transform: FlowCollector.(T) -> Unit): Flow = TODO() - -fun f() { - fun doEmit(collector: FlowCollector) {} - flowOf(1).transform { doEmit(this) } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.kt index 924100af61b..0b588e2ceac 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt51464.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !RENDER_DIAGNOSTICS_FULL_TEXT fun flowOf(value: T): Flow = TODO() @@ -9,5 +10,5 @@ fun Flow.transform(transform: FlowCollector.(T) -> Unit): Flow = fun f() { fun doEmit(collector: FlowCollector) {} - flowOf(1).transform { doEmit(this) } -} \ No newline at end of file + flowOf(1).transform { doEmit(this) } +} diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.kt index 34ba219e2e5..12b1cf1bee8 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.kt @@ -10,10 +10,10 @@ data class InputWrapper(val value: TItem) data class Output(val source: InputWrapper>) fun main2(input: InputWrapper): Output { - val output = input.doMapping( + val output = input.doMapping( foo = { buildList { add("this is List") } }, bar = { it.isNotEmpty() }, ) - return Output(source = output) + return Output(source = output) } diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestriction.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestriction.kt index 9444a280bde..0f9eb9057cf 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestriction.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestriction.kt @@ -8,7 +8,7 @@ fun T.extension() {} fun use(p: Any?) {} fun test1() { - a { + a { this.get(0).extension() use(this.get(0)::extension) use(it::extension) @@ -17,7 +17,7 @@ fun test1() { fun test2() { - a { + a { val v = this.get(0) v.extension() use(v::extension) @@ -27,7 +27,7 @@ fun test2() { fun test3() { operator fun T.getValue(thisRef: Any?, prop: Any?): T = this - a { + a { val v by this.get(0) v.extension() use(v::extension) @@ -40,7 +40,7 @@ class Box(val t: TIn) fun test4() { operator fun T.provideDelegate(thisRef: Any?, prop: Any?): Box = Box(this) operator fun Box.getValue(thisRef: Any?, prop: Any?): T = this.t - a { + a { val v by this.get(0) v.extension() use(v::extension) @@ -53,7 +53,7 @@ fun b(lambda: R.(List) -> Unit) {} fun test5() { operator fun T.invoke(): T = this - b { + b { extension() this().extension() use(::extension) @@ -63,10 +63,10 @@ fun test5() { val T.genericLambda: T.((T) -> Unit) -> Unit get() = {} fun test6() { - b { + b { extension() genericLambda { } genericLambda { it.extension() } use(::extension) } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestrictionDisabled.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestrictionDisabled.kt index 38f5c9cbc8d..4bd4c5e5a68 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestrictionDisabled.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestrictionDisabled.kt @@ -9,7 +9,7 @@ fun T.extension() {} fun use(p: Any?) {} fun test1() { - a { + a { this.get(0).extension() use(this.get(0)::extension) use(it::extension) @@ -18,7 +18,7 @@ fun test1() { fun test2() { - a { + a { val v = this.get(0) v.extension() use(v::extension) @@ -28,7 +28,7 @@ fun test2() { fun test3() { operator fun T.getValue(thisRef: Any?, prop: Any?): T = this - a { + a { val v by this.get(0) v.extension() use(v::extension) @@ -41,7 +41,7 @@ class Box(val t: TIn) fun test4() { operator fun T.provideDelegate(thisRef: Any?, prop: Any?): Box = Box(this) operator fun Box.getValue(thisRef: Any?, prop: Any?): T = this.t - a { + a { val v by this.get(0) v.extension() use(v::extension) @@ -54,7 +54,7 @@ fun b(lambda: R.(List) -> Unit) {} fun test5() { operator fun T.invoke(): T = this - b { + b { extension() this().extension() use(::extension) @@ -64,10 +64,10 @@ fun test5() { val T.genericLambda: T.((T) -> Unit) -> Unit get() = {} fun test6() { - b { + b { extension() genericLambda { } genericLambda { it.extension() } use(::extension) } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/afterBareReturn.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/afterBareReturn.kt index 70a0c2fb361..a7534a4991e 100644 --- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/afterBareReturn.kt +++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/afterBareReturn.kt @@ -27,7 +27,7 @@ fun test3() = run incompatibleI() // ? either uninferred T or error (Unit run { +fun test4() = run { if (p) return@run incompatibleC() // ? either uninferred T or error (Unit , iUnit: Inv) { if (iUnit is String) { launch { - run(A.flexible(iUnit)) { 42 } + run(A.flexible(iUnit)) { 42 } } } } diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.kt index 7eb5065d60d..ad5b187684e 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/compatibilityResolveWhenVariableHasComplexIntersectionType.kt @@ -20,7 +20,7 @@ object OnlyOne { fun , S : T> greater(x: Bar, t: T) {} fun test(b: Bar) { - greater(b, b) + greater(b, b) } } @@ -34,4 +34,4 @@ object GoodOldCandidate { greater(b, b) } } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.diag.txt index e2e1d59a0bd..3e124976496 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.diag.txt @@ -1,6 +1,3 @@ -/kt45461.kt:5:25: warning: parameter 'foo' is never used - fun takeFoo(foo: Foo) {} - ^ -/kt45461.kt:10:19: warning: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, Int (multiple incompatible classes). This will become an error in Kotlin 1.9 +/kt45461.kt:10:19: error: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, Int (multiple incompatible classes) Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 ^ diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.kt index 4e405cc242e..bf6039f5b4c 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.kt @@ -7,5 +7,5 @@ class Bar { fun main() { val foo = Foo() - Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 -} \ No newline at end of file + Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.diag.txt index ed7c399c3aa..73342d7bf1c 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.diag.txt @@ -1,7 +1,4 @@ -/kt45461_12.kt:5:25: warning: parameter 'foo' is never used - fun takeFoo(foo: Foo) {} - ^ -/kt45461_12.kt:12:19: warning: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, K (multiple incompatible classes: String, Number). This will become an error in Kotlin 1.9 +/kt45461_12.kt:12:19: error: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, K (multiple incompatible classes: String, Number) Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 ^ diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.kt index 7dad9ad84c1..4024aa17b80 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.kt @@ -9,5 +9,5 @@ interface A fun main() where N: A, N: Number { val foo = Foo() - Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 + Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 } diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.diag.txt index 3b066de193e..606c50ada14 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.diag.txt @@ -1,10 +1,4 @@ -/kt45461_2.kt:5:25: warning: parameter 'foo' is never used - fun takeFoo(foo: Foo) {} - ^ -/kt45461_2.kt:8:10: warning: 'Int' is a final type, and thus a value of the type parameter is predetermined -fun main() { - ^ -/kt45461_2.kt:10:19: warning: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, K (multiple incompatible classes: String, Int). This will become an error in Kotlin 1.9 +/kt45461_2.kt:10:19: error: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, K (multiple incompatible classes: String, Int) Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 ^ diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.kt index 47db6f85b93..efca16742f4 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.kt @@ -7,5 +7,5 @@ class Bar { fun Int> main() { val foo = Foo() - Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 -} \ No newline at end of file + Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.diag.txt index 10e291d7b89..6971be474d7 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.diag.txt @@ -1,6 +1,3 @@ -/kt45461_5.kt:5:25: warning: parameter 'foo' is never used - fun takeFoo(foo: Foo) {} - ^ -/kt45461_5.kt:10:19: warning: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, K (multiple incompatible classes: String, Number). This will become an error in Kotlin 1.9 +/kt45461_5.kt:10:19: error: type argument for a type parameter S can't be inferred because it has incompatible upper bounds: String, K (multiple incompatible classes: String, Number) Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 ^ diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.kt index cc208e86568..ddb67e48792 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.kt @@ -7,5 +7,5 @@ class Bar { fun main() { val foo = Foo() - Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 + Bar().takeFoo(foo) // error in 1.3.72, no error in 1.4.31 } diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.diag.txt index c8b97e42083..6208d961335 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.diag.txt @@ -1,16 +1,4 @@ -/kt48765.kt:4:44: warning: parameter 'x1' is never used - fun > foo(x1: T2, x2: T1) {} - ^ -/kt48765.kt:4:52: warning: parameter 'x2' is never used - fun > foo(x1: T2, x2: T1) {} - ^ -/kt48765.kt:8:13: warning: type argument for a type parameter T can't be inferred because it has incompatible upper bounds: String, Number (multiple incompatible classes). This will become an error in Kotlin 1.9 +/kt48765.kt:8:13: error: type argument for a type parameter T can't be inferred because it has incompatible upper bounds: String, Number (multiple incompatible classes) B().foo(x, foo()) ^ -/kt48765.kt:12:9: warning: 'String' is a final type, and thus a value of the type parameter is predetermined -fun foo(): T { - ^ -/kt48765.kt:13:15: warning: unchecked cast: String to T - return "" as T // this cast is safe because String is final. - ^ diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.kt index dfa53d701e2..e4c89a6ca8d 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.kt @@ -5,7 +5,7 @@ class B { } class C(val x: T, val y: T2) { fun test() { - B().foo(x, foo()) + B().foo(x, foo()) } } open class D: A() @@ -14,4 +14,4 @@ fun String> foo(): T { } fun main() { C(D(), 10.5).test() -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_3.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_3.kt index 6d707f0aa1a..ef4fcd6b323 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_3.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_3.kt @@ -7,5 +7,5 @@ fun exampleGenericFunction(func: V) where T: Base, V: (T) -> Unit { fun main() { val func: (DoesNotImplementBase) -> Unit = { } - exampleGenericFunction(func) // expected this to be a compilation error as the T: Base constraint should not be satisfied -} \ No newline at end of file + exampleGenericFunction(func) // expected this to be a compilation error as the T: Base constraint should not be satisfied +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_4.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_4.kt index 51b8c289d08..f7571d72f1c 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_4.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48935_4.kt @@ -7,5 +7,5 @@ fun exampleGenericFunction(func: V) where T: Base, V: (T) -> Unit { fun main() { val func: (DoesNotImplementBase) -> Unit = { } - exampleGenericFunction(func) // expected this to be a compilation error as the T: Base constraint should not be satisfied -} \ No newline at end of file + exampleGenericFunction(func) // expected this to be a compilation error as the T: Base constraint should not be satisfied +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt index c6e2f84b3da..bdb76425f31 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48987.kt @@ -5,7 +5,7 @@ fun box(): String { return try { val range1 = 0..1 range1 as List - range1.joinToString { "" } + range1.joinToString { "" } } catch (e: java.lang.ClassCastException) { "OK" } diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.diag.txt index 33f2b83623e..66d72082bb0 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.diag.txt @@ -1,4 +1,4 @@ -/kt49661.kt:10:5: warning: type argument for a type parameter T can't be inferred because it has incompatible upper bounds: Foo, Int (multiple incompatible classes). This will become an error in Kotlin 1.9 +/kt49661.kt:10:5: error: type argument for a type parameter T can't be inferred because it has incompatible upper bounds: Foo, Int (multiple incompatible classes) f { g() } ^ diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.kt index 3a18c6b377d..4aab25847d8 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.kt @@ -7,5 +7,5 @@ inline fun f(block: ()->R?): R? { } fun main() { - f { g() } -} \ No newline at end of file + f { g() } +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52393.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52393.kt index 6980ed30a68..61ebeafe37f 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52393.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52393.kt @@ -12,6 +12,6 @@ fun main() { // val number: Long = 5 // works with (WrapperFunctions()) { - wrapper greaterEq number + wrapper greaterEq number } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52431.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52431.kt index 99e05da1c82..15d5eca1ed5 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52431.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt52431.kt @@ -9,5 +9,5 @@ infix fun , S : T?> ExpressionWithColumnType.less(t: T) infix fun , S : T?> Expression.less(other: Expression) {} fun main(x: Column, y: Double) { - x less y // error in 1.7.20, no error in 1.7.0 + x less y // error in 1.7.20, no error in 1.7.0 } diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/nullableEmptyIntersection.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/nullableEmptyIntersection.kt index 3a9f23bef4a..e799b8183b2 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/nullableEmptyIntersection.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/nullableEmptyIntersection.kt @@ -3,5 +3,5 @@ fun String> g(): T? = null fun f(block: () -> R?): R? = block() fun main() { - f { g() /* OK, g() is inferred into {Int & String}? */ } -} \ No newline at end of file + f { g() /* OK, g() is inferred into {Int & String}? */ } +} diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt index 93c4040d184..950ca0ac77a 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt @@ -1,12 +1,3 @@ -/selectFromCovariantAndContravariantTypes.kt:10:22: warning: parameter 'y' is never used -fun select(x: K, y: K): K = x - ^ -/selectFromCovariantAndContravariantTypes.kt:11:19: warning: parameter 'x' is never used -fun genericIn(x: In) {} - ^ -/selectFromCovariantAndContravariantTypes.kt:12:20: warning: parameter 'x' is never used -fun genericOut(x: Out) {} - ^ -/selectFromCovariantAndContravariantTypes.kt:15:5: warning: type argument for a type parameter V can't be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes). This will become an error in Kotlin 1.9 +/selectFromCovariantAndContravariantTypes.kt:15:5: error: type argument for a type parameter V can't be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes) genericIn(select(a, b)) ^ diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.kt index 3be8a519d2d..69cad64465e 100644 --- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.kt +++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.kt @@ -12,7 +12,7 @@ fun genericIn(x: In) {} fun genericOut(x: Out) {} fun test1(a: In, b: In) { - genericIn(select(a, b)) + genericIn(select(a, b)) } fun test2(a: Out, b: Out) { diff --git a/compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.fir.kt deleted file mode 100644 index 447f6acc5e9..00000000000 --- a/compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.fir.kt +++ /dev/null @@ -1,71 +0,0 @@ -// WITH_STDLIB -// !LANGUAGE: +CustomEqualsInValueClasses -// !DIAGNOSTICS: -UNUSED_PARAMETER - -@JvmInline -value class IC1(val x: Any) { - fun box() {} - fun box(x: Any) {} - - fun unbox() {} - fun unbox(x: Any) {} - - override fun equals(other: Any?): Boolean = true - override fun hashCode(): Int = 0 -} - -@JvmInline -value class IC2(val x: Any) { - fun box(x: Any) {} - fun box(): Any = TODO() - - fun unbox(x: Any) {} - fun unbox(): Any = TODO() - - fun equals(my: Any, other: Any): Boolean = true - fun hashCode(a: Any): Int = 0 -} - -@JvmInline -value class IC3(val x: Any) { - fun box(x: Any): Any = TODO() - fun unbox(x: Any): Any = TODO() - - fun equals(): Boolean = true -} - -interface WithBox { - fun box(): String -} - -@JvmInline -value class IC4(val s: String) : WithBox { - override fun box(): String = "" -} - -@JvmInline -value class IC5(val a: String) { - constructor(i: Int) : this(i.toString()) { - TODO("something") - } -} - -@JvmInline -value class IC6(val a: String) { - fun equals(other: IC6): Boolean = true -} - -@JvmInline -value class IC7(val a: String) { - fun equals(other: IC7<*>): Boolean = true -} - -@JvmInline -value class IC8(val a: String) { - fun equals(other: IC8): Boolean = true -} - -@JvmInline -value class IC9(val a: String) { - fun equals(other: IC9): Boolean = true -} diff --git a/compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.kt b/compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.kt index 1ecbe48d1f3..3d71f79ce01 100644 --- a/compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.kt +++ b/compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // WITH_STDLIB // !LANGUAGE: +CustomEqualsInValueClasses // !DIAGNOSTICS: -UNUSED_PARAMETER @@ -45,7 +46,7 @@ value class IC4(val s: String) : WithBox { @JvmInline value class IC5(val a: String) { - constructor(i: Int) : this(i.toString()) { + constructor(i: Int) : this(i.toString()) { TODO("something") } } diff --git a/compiler/testData/diagnostics/tests/j+k/deprecations/forMixedOverride.fir.kt b/compiler/testData/diagnostics/tests/j+k/deprecations/forMixedOverride.fir.kt deleted file mode 100644 index 29cc1c21a5b..00000000000 --- a/compiler/testData/diagnostics/tests/j+k/deprecations/forMixedOverride.fir.kt +++ /dev/null @@ -1,28 +0,0 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS -// FILE: J.java -public class J { - @Deprecated - public void foo() {} -} -// FILE: J2.java -public class J2 extends J implements WithDeprecation { - @Override - public void foo() {} -} - -// FILE: main.kt -interface WithDeprecation { - @Deprecated("") - fun foo() -} - -class A : J(), WithDeprecation { - override fun foo() {} -} - -fun main() { - J().foo() - - J2().foo() - A().foo() -} diff --git a/compiler/testData/diagnostics/tests/j+k/deprecations/forMixedOverride.kt b/compiler/testData/diagnostics/tests/j+k/deprecations/forMixedOverride.kt index dfa45fbb8a7..41e94a841a4 100644 --- a/compiler/testData/diagnostics/tests/j+k/deprecations/forMixedOverride.kt +++ b/compiler/testData/diagnostics/tests/j+k/deprecations/forMixedOverride.kt @@ -1,4 +1,5 @@ // FIR_DISABLE_LAZY_RESOLVE_CHECKS +// FIR_IDENTICAL // FILE: J.java public class J { @Deprecated @@ -17,12 +18,12 @@ interface WithDeprecation { } class A : J(), WithDeprecation { - override fun foo() {} + override fun foo() {} } fun main() { J().foo() - J2().foo() - A().foo() + J2().foo() + A().foo() } diff --git a/compiler/testData/diagnostics/tests/syntheticSet.kt b/compiler/testData/diagnostics/tests/syntheticSet.kt index b1f56737d30..e849419708e 100644 --- a/compiler/testData/diagnostics/tests/syntheticSet.kt +++ b/compiler/testData/diagnostics/tests/syntheticSet.kt @@ -19,7 +19,7 @@ public class Wrapper { // FILE: test.kt fun foo(container: Container<*>, wrapper: Wrapper) { - container.w = wrapper + container.w = wrapper container.wrapper = wrapper container.setWrapper(wrapper) } diff --git a/compiler/testData/diagnostics/tests/testWithModifiedMockJdk/notConsideredMethod.kt b/compiler/testData/diagnostics/tests/testWithModifiedMockJdk/notConsideredMethod.kt index d1d87cd1e57..b93a1e3d2f1 100644 --- a/compiler/testData/diagnostics/tests/testWithModifiedMockJdk/notConsideredMethod.kt +++ b/compiler/testData/diagnostics/tests/testWithModifiedMockJdk/notConsideredMethod.kt @@ -9,5 +9,5 @@ interface A : MutableCollection { fun foo(x: MutableCollection, y: Collection, z: A) { x.nonExistingMethod(1).checkType { _() } y.nonExistingMethod("") - z.nonExistingMethod("") + z.nonExistingMethod("") } diff --git a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.fir.kt deleted file mode 100644 index c06de3195d0..00000000000 --- a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.fir.kt +++ /dev/null @@ -1,125 +0,0 @@ -// !SKIP_JAVAC -// !LANGUAGE: +CustomEqualsInValueClasses, +ValueClasses -// ALLOW_KOTLIN_PACKAGE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -package kotlin.jvm - -annotation class JvmInline - -@JvmInline -value class IC1(val x: Any) { - fun box() {} - fun box(x: Any) {} - - fun unbox() {} - fun unbox(x: Any) {} - - override fun equals(other: Any?): Boolean = true - override fun hashCode(): Int = 0 -} - -@JvmInline -value class IC2(val x: Any) { - fun box(x: Any) {} - fun box(): Any = TODO() - - fun unbox(x: Any) {} - fun unbox(): Any = TODO() - - fun equals(my: Any, other: Any): Boolean = true - fun hashCode(a: Any): Int = 0 -} - -@JvmInline -value class IC3(val x: Any) { - fun box(x: Any): Any = TODO() - fun unbox(x: Any): Any = TODO() - - fun equals(): Boolean = true -} - -interface WithBox { - fun box(): String -} - -@JvmInline -value class IC4(val s: String) : WithBox { - override fun box(): String = "" -} - -@JvmInline -value class IC5(val a: String) { - constructor(i: Int) : this(i.toString()) { - TODO("something") - } -} - -@JvmInline -value class IC6(val a: String) { - fun equals(other: IC6): Boolean = true -} - -@JvmInline -value class MFVC1(val x: Any, val y: Any) { - fun box() {} - fun box(x: Any) {} - - fun unbox() {} - fun unbox(x: Any) {} - - override fun equals(other: Any?): Boolean = true - override fun hashCode(): Int = 0 -} - -@JvmInline -value class MFVC2(val x: Any, val y: Any) { - fun box(x: Any) {} - fun box(): Any = TODO() - - fun unbox(x: Any) {} - fun unbox(): Any = TODO() - - fun equals(my: Any, other: Any): Boolean = true - fun hashCode(a: Any): Int = 0 -} - -@JvmInline -value class MFVC3(val x: Any, val y: Any) { - fun box(x: Any): Any = TODO() - fun unbox(x: Any): Any = TODO() - - fun equals(): Boolean = true -} - -@JvmInline -value class MFVC4(val s: String, val t: String) : WithBox { - override fun box(): String = "" -} - -@JvmInline -value class MFVC5(val a: String, val b: String) { - constructor(i: Int) : this(i.toString(), "6") { - TODO("something") - } -} - -@JvmInline -value class MFVC6(val a: String, val b: String) { - fun equals(other: MFVC6): Boolean = true -} - -@JvmInline -value class MFVC7(val a: String, val b: String) { - fun equals(other: MFVC7<*>): Boolean = true -} - -@JvmInline -value class MFVC8(val a: String, val b: String) { - fun equals(other: MFVC8): Boolean = true -} - -@JvmInline -value class MFVC9(val a: String, val b: String) { - fun equals(other: MFVC9): Boolean = true -} diff --git a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.kt b/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.kt index 0830456cd3b..082516bb0a4 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.kt +++ b/compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !SKIP_JAVAC // !LANGUAGE: +CustomEqualsInValueClasses, +ValueClasses // ALLOW_KOTLIN_PACKAGE @@ -50,7 +51,7 @@ value class IC4(val s: String) : WithBox { @JvmInline value class IC5(val a: String) { - constructor(i: Int) : this(i.toString()) { + constructor(i: Int) : this(i.toString()) { TODO("something") } } @@ -99,7 +100,7 @@ value class MFVC4(val s: String, val t: String) : WithBox { @JvmInline value class MFVC5(val a: String, val b: String) { - constructor(i: Int) : this(i.toString(), "6") { + constructor(i: Int) : this(i.toString(), "6") { TODO("something") } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt index 9dd6e3cd967..a236d190ec6 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt @@ -13,6 +13,6 @@ suspend fun fib(n: Long) = async { when { n < 2 -> n - else -> fib(n - 1).await() + fib(n - 2).await() + else -> fib(n - 1).await() + fib(n - 2).await() } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/nonModifierFormForBuiltInWithFun.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/nonModifierFormForBuiltInWithFun.kt index 7aa35dbe217..5e39df19fa0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/nonModifierFormForBuiltInWithFun.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/nonModifierFormForBuiltInWithFun.kt @@ -4,7 +4,7 @@ infix fun Int.suspend(c: () -> Unit) { c() } fun bar() { - 1 suspend fun() { + 1 suspend fun() { println() } @@ -12,7 +12,7 @@ fun bar() { println() } - 1 suspend @Ann fun() { + 1 suspend @Ann fun() { println() } } @@ -22,7 +22,7 @@ fun bar() { annotation class Ann fun main(suspend: WLambdaInvoke) { - 1 suspend fun() {} + 1 suspend fun() {} } class WLambdaInvoke { diff --git a/compiler/testData/diagnostics/testsWithStdLib/greater.kt b/compiler/testData/diagnostics/testsWithStdLib/greater.kt index a5e1b0a7e61..ac5ce22a56d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/greater.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/greater.kt @@ -7,6 +7,6 @@ fun , S : T?> Expression.greater(other: T): GreaterOp = fun foo(countExpr: Expression) { countExpr.greater(0) - countExpr.greater("0") + countExpr.greater("0") countExpr.greater("0") } diff --git a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml index 829a2afa282..7a5bb6f8bc1 100644 --- a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml +++ b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml @@ -9,6 +9,7 @@ + diff --git a/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected b/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected index 37c54714267..35101d591ce 100644 --- a/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected +++ b/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected @@ -3,6 +3,7 @@ Buildfile: [TestData]/build.xml build: [kotlinc] Compiling [[TestData]/main.kt] => [[Temp]/hello.jar] + [kotlinc] warning: language version 1.5 is deprecated and its support will be removed in a future version of Kotlin [kotlinc] [TestData]/main.kt:1:15: error: suspend function type is allowed as a supertype only since version 1.6 [kotlinc] interface A : suspend () -> Unit [kotlinc] ^ diff --git a/compiler/testData/ir/irJsText/external/kt38765.fir.ir.txt b/compiler/testData/ir/irJsText/external/kt38765.fir.ir.txt index 5829ed6966d..cf4276dd3b2 100644 --- a/compiler/testData/ir/irJsText/external/kt38765.fir.ir.txt +++ b/compiler/testData/ir/irJsText/external/kt38765.fir.ir.txt @@ -81,6 +81,10 @@ FILE fqName:events fileName:/kt38765.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:events.internal.NestedExternalEnum VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum, other:events.internal.NestedExternalEnum) returnType:kotlin.Int [fake_override,operator] overridden: public final fun compareTo (other: E of kotlin.Enum): kotlin.Int [operator] declared in kotlin.Enum diff --git a/compiler/testData/ir/irJsText/external/kt38765.fir.kt.txt b/compiler/testData/ir/irJsText/external/kt38765.fir.kt.txt index 477c488a046..7f31e0f1344 100644 --- a/compiler/testData/ir/irJsText/external/kt38765.fir.kt.txt +++ b/compiler/testData/ir/irJsText/external/kt38765.fir.kt.txt @@ -49,6 +49,9 @@ open external class internal { fun valueOf(value: String): NestedExternalEnum /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } interface NestedExternalInterface { diff --git a/compiler/testData/ir/irText/classes/classes.fir.ir.txt b/compiler/testData/ir/irText/classes/classes.fir.ir.txt index f8c1c606603..5bbb6e08947 100644 --- a/compiler/testData/ir/irText/classes/classes.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/classes.fir.ir.txt @@ -83,6 +83,10 @@ FILE fqName: fileName:/classes.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnumClass VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/classes/classes.fir.kt.txt b/compiler/testData/ir/irText/classes/classes.fir.kt.txt index 902608557ae..6ef3484b7ba 100644 --- a/compiler/testData/ir/irText/classes/classes.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/classes.fir.kt.txt @@ -40,4 +40,8 @@ enum class TestEnumClass : Enum { fun valueOf(value: String): TestEnumClass /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/classes/enum.fir.ir.txt b/compiler/testData/ir/irText/classes/enum.fir.ir.txt index e2a6a09e993..dcb359665af 100644 --- a/compiler/testData/ir/irText/classes/enum.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/enum.fir.ir.txt @@ -17,6 +17,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum1 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum1> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -93,6 +97,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum2 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum2> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -203,6 +211,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum3 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum3> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -414,6 +426,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum4 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum4> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -490,6 +506,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum5 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum5> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -580,6 +600,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum6 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum6> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/classes/enum.fir.kt.txt b/compiler/testData/ir/irText/classes/enum.fir.kt.txt index f162b559184..5b44caa02a7 100644 --- a/compiler/testData/ir/irText/classes/enum.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/enum.fir.kt.txt @@ -13,6 +13,9 @@ enum class TestEnum1 : Enum { fun valueOf(value: String): TestEnum1 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } open enum class TestEnum2 : Enum { @@ -36,6 +39,9 @@ open enum class TestEnum2 : Enum { fun valueOf(value: String): TestEnum2 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } abstract enum class TestEnum3 : Enum { @@ -64,6 +70,9 @@ abstract enum class TestEnum3 : Enum { fun valueOf(value: String): TestEnum3 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } abstract enum class TestEnum4 : Enum { @@ -117,6 +126,9 @@ abstract enum class TestEnum4 : Enum { fun valueOf(value: String): TestEnum4 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } open enum class TestEnum5 : Enum { @@ -140,6 +152,9 @@ open enum class TestEnum5 : Enum { fun valueOf(value: String): TestEnum5 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } fun f(): Int { @@ -171,4 +186,8 @@ open enum class TestEnum6 : Enum { fun valueOf(value: String): TestEnum6 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/classes/enum.ir.txt b/compiler/testData/ir/irText/classes/enum.ir.txt index 117d4af64c5..e20a4a80ed7 100644 --- a/compiler/testData/ir/irText/classes/enum.ir.txt +++ b/compiler/testData/ir/irText/classes/enum.ir.txt @@ -65,6 +65,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum1 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum1> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES CLASS ENUM_CLASS name:TestEnum2 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum2>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum2 CONSTRUCTOR visibility:private <> (x:kotlin.Int) returnType:.TestEnum2 [primary] @@ -149,6 +153,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum2 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum2> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES CLASS ENUM_CLASS name:TestEnum3 modality:ABSTRACT visibility:public superTypes:[kotlin.Enum<.TestEnum3>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum3 CONSTRUCTOR visibility:private <> () returnType:.TestEnum3 [primary] @@ -276,6 +284,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum3 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum3> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES CLASS ENUM_CLASS name:TestEnum4 modality:ABSTRACT visibility:public superTypes:[kotlin.Enum<.TestEnum4>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum4 CONSTRUCTOR visibility:private <> (x:kotlin.Int) returnType:.TestEnum4 [primary] @@ -513,6 +525,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum4 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum4> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES CLASS ENUM_CLASS name:TestEnum5 modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum5>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum5 CONSTRUCTOR visibility:private <> (x:kotlin.Int) returnType:.TestEnum5 [primary] @@ -597,6 +613,10 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum5 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum5> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN name:f visibility:public modality:FINAL <> () returnType:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun f (): kotlin.Int declared in ' @@ -695,3 +715,7 @@ FILE fqName: fileName:/enum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum6 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.TestEnum6> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES diff --git a/compiler/testData/ir/irText/classes/enum.kt.txt b/compiler/testData/ir/irText/classes/enum.kt.txt index b787204bd05..48d4ceb8bf9 100644 --- a/compiler/testData/ir/irText/classes/enum.kt.txt +++ b/compiler/testData/ir/irText/classes/enum.kt.txt @@ -13,6 +13,9 @@ enum class TestEnum1 : Enum { fun valueOf(value: String): TestEnum1 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } enum class TestEnum2 : Enum { @@ -36,6 +39,9 @@ enum class TestEnum2 : Enum { fun valueOf(value: String): TestEnum2 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } abstract enum class TestEnum3 : Enum { @@ -65,6 +71,9 @@ abstract enum class TestEnum3 : Enum { fun valueOf(value: String): TestEnum3 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } abstract enum class TestEnum4 : Enum { @@ -119,6 +128,9 @@ abstract enum class TestEnum4 : Enum { fun valueOf(value: String): TestEnum4 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } enum class TestEnum5 : Enum { @@ -142,6 +154,9 @@ enum class TestEnum5 : Enum { fun valueOf(value: String): TestEnum5 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } fun f(): Int { @@ -173,4 +188,8 @@ enum class TestEnum6 : Enum { fun valueOf(value: String): TestEnum6 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt b/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt index 038fc2933c9..fbd0c5bdb89 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt @@ -14,6 +14,10 @@ FILE fqName: fileName:/enumClassModality.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestFinalEnum1 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -82,6 +86,10 @@ FILE fqName: fileName:/enumClassModality.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestFinalEnum2 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -140,6 +148,10 @@ FILE fqName: fileName:/enumClassModality.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestFinalEnum3 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -244,6 +256,10 @@ FILE fqName: fileName:/enumClassModality.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestOpenEnum1 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -353,6 +369,10 @@ FILE fqName: fileName:/enumClassModality.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestOpenEnum2 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -461,6 +481,10 @@ FILE fqName: fileName:/enumClassModality.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestAbstractEnum1 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -584,6 +608,10 @@ FILE fqName: fileName:/enumClassModality.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestAbstractEnum2 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:.IFoo) returnType:kotlin.Unit [fake_override] overridden: public abstract fun foo (): kotlin.Unit declared in .IFoo diff --git a/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt b/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt index d8342c49ad4..34e7aa73f03 100644 --- a/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt @@ -11,6 +11,9 @@ enum class TestFinalEnum1 : Enum { fun valueOf(value: String): TestFinalEnum1 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } open enum class TestFinalEnum2 : Enum { @@ -30,6 +33,9 @@ open enum class TestFinalEnum2 : Enum { fun valueOf(value: String): TestFinalEnum2 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } enum class TestFinalEnum3 : Enum { @@ -48,6 +54,9 @@ enum class TestFinalEnum3 : Enum { fun valueOf(value: String): TestFinalEnum3 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } open enum class TestOpenEnum1 : Enum { @@ -75,6 +84,9 @@ open enum class TestOpenEnum1 : Enum { fun valueOf(value: String): TestOpenEnum1 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } open enum class TestOpenEnum2 : Enum { @@ -104,6 +116,9 @@ open enum class TestOpenEnum2 : Enum { fun valueOf(value: String): TestOpenEnum2 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } abstract enum class TestAbstractEnum1 : Enum { @@ -131,6 +146,9 @@ abstract enum class TestAbstractEnum1 : Enum { fun valueOf(value: String): TestAbstractEnum1 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } interface IFoo { @@ -162,4 +180,8 @@ open enum class TestAbstractEnum2 : IFoo, Enum { fun valueOf(value: String): TestAbstractEnum2 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt index 85672a2bece..1354f71778b 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt @@ -184,6 +184,10 @@ FILE fqName: fileName:/enumWithMultipleCtors.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.A VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt index 286aaec7002..94bbc7fff96 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt @@ -57,5 +57,8 @@ open enum class A : Enum { fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt index 009051e8905..bc91e5e4cae 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt @@ -30,6 +30,10 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Test0 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.Test0> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -105,6 +109,10 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Test1 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.Test1> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -304,6 +312,10 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Test2 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.Test2> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.kt.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.kt.txt index e9f1098f803..deca8237e81 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.kt.txt @@ -19,6 +19,9 @@ open enum class Test0 : Enum { fun valueOf(value: String): Test0 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } open enum class Test1 : Enum { @@ -44,6 +47,9 @@ open enum class Test1 : Enum { fun valueOf(value: String): Test1 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } abstract enum class Test2 : Enum { @@ -94,4 +100,8 @@ abstract enum class Test2 : Enum { fun valueOf(value: String): Test2 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt index dbe0c3c4a6f..2b9e2112a23 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt @@ -78,6 +78,10 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Test0 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.Test0> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES CLASS ENUM_CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Enum<.Test1>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test1 CONSTRUCTOR visibility:private <> (x:kotlin.Int) returnType:.Test1 [primary] @@ -161,6 +165,10 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Test1 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.Test1> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES CLASS ENUM_CLASS name:Test2 modality:ABSTRACT visibility:public superTypes:[kotlin.Enum<.Test2>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test2 CONSTRUCTOR visibility:private <> (x:kotlin.Int) returnType:.Test2 [primary] @@ -386,3 +394,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Test2 VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.Test2> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt index 6df53812b47..20b15eb8c15 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.kt.txt @@ -19,6 +19,9 @@ enum class Test0 : Enum { fun valueOf(value: String): Test0 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } enum class Test1 : Enum { @@ -44,6 +47,9 @@ enum class Test1 : Enum { fun valueOf(value: String): Test1 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } abstract enum class Test2 : Enum { @@ -95,4 +101,8 @@ abstract enum class Test2 : Enum { fun valueOf(value: String): Test2 /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/classes/kt44013.fir.ir.txt b/compiler/testData/ir/irText/classes/kt44013.fir.ir.txt deleted file mode 100644 index 996ce4a44e4..00000000000 --- a/compiler/testData/ir/irText/classes/kt44013.fir.ir.txt +++ /dev/null @@ -1,69 +0,0 @@ -FILE fqName: fileName:/kt44013.kt - CLASS CLASS name:Test1 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test1 - CONSTRUCTOR visibility:public <> () returnType:.Test1 [primary] - BLOCK_BODY - ERROR_CALL 'Cannot find delegated constructor call' type=kotlin.Function0 - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0]' - FUN FAKE_OVERRIDE name:invoke visibility:public modality:ABSTRACT <> ($this:kotlin.Function0) returnType:kotlin.Int [fake_override,operator] - overridden: - public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Function0 - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Base - CONSTRUCTOR visibility:public <> () returnType:.Base [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:Test2 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0; .Base] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test2 - CONSTRUCTOR visibility:public <> () returnType:.Test2 [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Base' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0; .Base]' - FUN FAKE_OVERRIDE name:invoke visibility:public modality:ABSTRACT <> ($this:kotlin.Function0) returnType:kotlin.Int [fake_override,operator] - overridden: - public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Function0 - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Function0 - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in .Base - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Function0 - public open fun hashCode (): kotlin.Int [fake_override] declared in .Base - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Function0 - public open fun toString (): kotlin.String [fake_override] declared in .Base - $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/classes/kt44013.ir.txt b/compiler/testData/ir/irText/classes/kt44013.ir.txt deleted file mode 100644 index d4dac6f3476..00000000000 --- a/compiler/testData/ir/irText/classes/kt44013.ir.txt +++ /dev/null @@ -1,69 +0,0 @@ -FILE fqName: fileName:/kt44013.kt - CLASS CLASS name:Test1 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test1 - CONSTRUCTOR visibility:public <> () returnType:.Test1 [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0]' - FUN FAKE_OVERRIDE name:invoke visibility:public modality:ABSTRACT <> ($this:kotlin.Function0) returnType:kotlin.Int [fake_override,operator] - overridden: - public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Function0 - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Base - CONSTRUCTOR visibility:public <> () returnType:.Base [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]' - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:Test2 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0; .Base] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test2 - CONSTRUCTOR visibility:public <> () returnType:.Test2 [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in .Base' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:ABSTRACT visibility:public superTypes:[kotlin.Function0; .Base]' - FUN FAKE_OVERRIDE name:invoke visibility:public modality:ABSTRACT <> ($this:kotlin.Function0) returnType:kotlin.Int [fake_override,operator] - overridden: - public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0 - $this: VALUE_PARAMETER name: type:kotlin.Function0 - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Function0 - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in .Base - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Function0 - public open fun hashCode (): kotlin.Int [fake_override] declared in .Base - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String [fake_override] declared in kotlin.Function0 - public open fun toString (): kotlin.String [fake_override] declared in .Base - $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/classes/kt44013.kt b/compiler/testData/ir/irText/classes/kt44013.kt deleted file mode 100644 index 74b3c1b8b22..00000000000 --- a/compiler/testData/ir/irText/classes/kt44013.kt +++ /dev/null @@ -1,10 +0,0 @@ -// TARGET_BACKEND: JVM -// SKIP_KT_DUMP -// IGNORE_FIR_DIAGNOSTICS - -// See KT-44013: FE accepts incorrect code in 1.5 - -abstract class Test1 : () -> Int() - -abstract class Base -abstract class Test2 : () -> Int(), Base() diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt index 93c3add2101..4bb76d25a52 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt @@ -143,6 +143,10 @@ FILE fqName: fileName:/classesWithAnnotations.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt index 88aa89d0dcc..7dd70494a73 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt @@ -67,6 +67,9 @@ enum class TestEnum : Enum { fun valueOf(value: String): TestEnum /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } @TestAnn(x = "annotation") @@ -78,3 +81,4 @@ open annotation class TestAnnotation : Annotation { } } + diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt index 29de76bc226..86bf75ab132 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt @@ -109,6 +109,10 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.TestEnum VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt index c9024835c28..e0c10b2e195 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt @@ -40,4 +40,8 @@ open enum class TestEnum : Enum { fun valueOf(value: String): TestEnum /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt index d15f37c535a..798a46e4a1a 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt @@ -23,6 +23,10 @@ FILE fqName: fileName:/enumsInAnnotationArguments.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.En VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt index 9a05791b38f..65e078009c9 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt @@ -17,6 +17,9 @@ enum class En : Enum { fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } open annotation class TestAnn : Annotation { @@ -35,3 +38,4 @@ open annotation class TestAnn : Annotation { @TestAnn(x = En.A) fun test1() { } + diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt index c3f4a69bd8b..8382723ad70 100644 --- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt @@ -45,6 +45,10 @@ FILE fqName: fileName:/C.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.E VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.ir.txt index 992c58e620e..cea9a63c63d 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.ir.txt @@ -11,6 +11,10 @@ FILE fqName: fileName:/expectedEnumClass.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<.MyEnum> [expect] FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.MyEnum [expect] VALUE_PARAMETER name:value index:0 type:kotlin.String + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [expect,val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [expect,val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [expect,fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum @@ -72,6 +76,10 @@ FILE fqName: fileName:/expectedEnumClass.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.MyEnum VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.kt.txt index 28d099e85bd..e87ec63b13d 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.kt.txt @@ -6,6 +6,8 @@ expect enum class MyEnum : Enum { expect fun values(): Array expect fun valueOf(value: String): MyEnum + expect val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ } @@ -26,4 +28,8 @@ enum class MyEnum : Enum { fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.ir.txt b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.ir.txt deleted file mode 100644 index 23b58fad3f1..00000000000 --- a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.ir.txt +++ /dev/null @@ -1,48 +0,0 @@ -FILE fqName: fileName:/useNextParamInLambda.kt - FUN name:f visibility:public modality:FINAL <> (f1:kotlin.Function0, f2:kotlin.Function0) returnType:kotlin.String - VALUE_PARAMETER name:f1 index:0 type:kotlin.Function0 - EXPRESSION_BODY - FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .f' - CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=kotlin.String origin=INVOKE - $this: GET_VAR 'f2: kotlin.Function0 declared in .f' type=kotlin.Function0 origin=VARIABLE_AS_FUNCTION - VALUE_PARAMETER name:f2 index:1 type:kotlin.Function0 - EXPRESSION_BODY - FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .f' - CONST String type=kotlin.String value="FAIL" - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun f (f1: kotlin.Function0, f2: kotlin.Function0): kotlin.String declared in ' - CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=kotlin.String origin=INVOKE - $this: GET_VAR 'f1: kotlin.Function0 declared in .f' type=kotlin.Function0 origin=VARIABLE_AS_FUNCTION - FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - VAR name:result type:kotlin.String [var] - CONST String type=kotlin.String value="fail" - TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - TRY type=kotlin.Any - try: BLOCK type=kotlin.String origin=null - CALL 'public final fun f (f1: kotlin.Function0, f2: kotlin.Function0): kotlin.String declared in ' type=kotlin.String origin=null - CATCH parameter=val e: java.lang.Exception [val] declared in .box - VAR name:e type:java.lang.Exception [val] - BLOCK type=kotlin.Unit origin=null - SET_VAR 'var result: kotlin.String [var] declared in .box' type=kotlin.Unit origin=EQ - CONST String type=kotlin.String value="OK" - RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' - CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS - $this: CALL 'public final fun f (f1: kotlin.Function0, f2: kotlin.Function0): kotlin.String declared in ' type=kotlin.String origin=null - f2: FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .box' - CONST String type=kotlin.String value="O" - other: CALL 'public final fun f (f1: kotlin.Function0, f2: kotlin.Function0): kotlin.String declared in ' type=kotlin.String origin=null - f1: FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .box' - CONST String type=kotlin.String value="K" diff --git a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.kt.txt b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.kt.txt deleted file mode 100644 index ab535e2e8dc..00000000000 --- a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.kt.txt +++ /dev/null @@ -1,28 +0,0 @@ -fun f(f1: Function0 = local fun (): String { - return f2.invoke() -} -, f2: Function0 = local fun (): String { - return "FAIL" -} -): String { - return f1.invoke() -} - -fun box(): String { - var result: String = "fail" - try { // BLOCK - f() - } - catch (e: Exception){ // BLOCK - result = "OK" - } - /*~> Unit */ - return f(, f2 = local fun (): String { - return "O" - } -).plus(other = f(f1 = local fun (): String { - return "K" - } -)) -} - diff --git a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.kt b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.kt index 2cc7c9d25f9..452a65b32d9 100644 --- a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.kt +++ b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.kt @@ -1,5 +1,6 @@ // IGNORE_BACKEND_K2: ANY // accessing uninitialized parameter is illegal in FIR +// LANGUAGE: -ProhibitIllegalValueParameterUsageInDefaultArguments fun f( f1: () -> String = { f2() }, diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt index 861fa012ee0..acf3b97a4f2 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt @@ -95,6 +95,10 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.X VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt index 898af00a36b..a0d41a38b3c 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt @@ -33,8 +33,12 @@ abstract enum class X : Enum { fun valueOf(value: String): X /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } fun box(): String { return X.B.().invoke() } + diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt index 05f2139e042..5cea0dddfa6 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt @@ -154,6 +154,10 @@ FILE fqName: fileName:/enumEntryReferenceFromEnumEntryClass.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.MyEnum VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt index 48ca5fef585..60694d16c79 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt @@ -65,4 +65,8 @@ open enum class MyEnum : Enum { fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt index 235d690a695..8bcddc8536e 100644 --- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt @@ -14,6 +14,10 @@ FILE fqName: fileName:/exhaustiveWhenElseBranch.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.A VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt index 057c233f5a0..53f36e74438 100644 --- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt @@ -11,6 +11,9 @@ enum class A : Enum { fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } fun testVariableAssignment_throws(a: A) { @@ -117,3 +120,4 @@ fun testLambdaResultExpression_throws(a: A) { } .invoke() /*~> Unit */ } + diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt index f6eb86e35af..fc51b4079a4 100644 --- a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt @@ -33,6 +33,10 @@ FILE fqName: fileName:/objectAsCallable.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.En VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt index 11639efa551..2b6a119e962 100644 --- a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt @@ -20,6 +20,9 @@ enum class En : Enum { fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } operator fun A.invoke(i: Int): Int { @@ -37,3 +40,4 @@ val test1: Int val test2: Int field = En.X.invoke(i = 42) get + diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt index c8a9598207e..6c7f8f1e7cf 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt @@ -48,6 +48,10 @@ FILE fqName: fileName:/temporaryInEnumEntryInitializer.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.En VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt index 8019c9ab30b..31fab7fc4cc 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt @@ -25,4 +25,8 @@ open enum class En : Enum { fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/expressions/values.fir.ir.txt b/compiler/testData/ir/irText/expressions/values.fir.ir.txt index 60f745375b3..df6bdc8f0ad 100644 --- a/compiler/testData/ir/irText/expressions/values.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/values.fir.ir.txt @@ -14,6 +14,10 @@ FILE fqName: fileName:/values.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Enum VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/expressions/values.fir.kt.txt b/compiler/testData/ir/irText/expressions/values.fir.kt.txt index 0466612fce3..15c58e94f05 100644 --- a/compiler/testData/ir/irText/expressions/values.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/values.fir.kt.txt @@ -11,6 +11,9 @@ enum class Enum : Enum { fun valueOf(value: String): Enum /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } object A { @@ -59,3 +62,4 @@ fun test3(): Int { fun test4(): Companion { return Companion } + diff --git a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt index 4d63579db53..7c1e4aebf89 100644 --- a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt @@ -20,6 +20,10 @@ FILE fqName: fileName:/whenSmartCastToEnum.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.En VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt index 59f4d4f0d28..1130c973fb9 100644 --- a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt +++ b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt @@ -15,6 +15,9 @@ enum class En : Enum { fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } fun test() { @@ -52,3 +55,4 @@ fun test() { } } } + diff --git a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt index 69a6f8a6fe5..f2a1d4ba9d1 100644 --- a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt @@ -71,6 +71,10 @@ FILE fqName: fileName:/lambdaInEnumEntryConstructorCall.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.ConfigurationParameter VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.ConfigurationParameter> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.kt.txt b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.kt.txt index a1d1c7aa375..d3f58a9e6d1 100644 --- a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.kt.txt @@ -29,4 +29,8 @@ open enum class ConfigurationParameter : Enum { fun valueOf(value: String): ConfigurationParameter /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt index 3bfd8505f7b..5aafdc0382c 100644 --- a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt +++ b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt @@ -119,3 +119,7 @@ FILE fqName: fileName:/lambdaInEnumEntryConstructorCall.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.ConfigurationParameter VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.ConfigurationParameter> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES diff --git a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.kt.txt b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.kt.txt index a6c19ce8fc2..374ed665423 100644 --- a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.kt.txt +++ b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.kt.txt @@ -29,4 +29,8 @@ enum class ConfigurationParameter : Enum { fun valueOf(value: String): ConfigurationParameter /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt index 40ed8bf7088..8544ffecbee 100644 --- a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt @@ -30,6 +30,10 @@ FILE fqName: fileName:/thisInEnumConstructor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.EE VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.EE> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt index b696e3f12b0..67642f4afb5 100644 --- a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt @@ -15,4 +15,8 @@ open enum class EE : Enum { fun valueOf(value: String): EE /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt index cceecff566b..ca1e8143ea2 100644 --- a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt @@ -78,3 +78,7 @@ FILE fqName: fileName:/thisInEnumConstructor.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.EE VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<.EE> + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt index e69f0dad3d1..4ca6b1fb93f 100644 --- a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt @@ -15,4 +15,8 @@ enum class EE : Enum { fun valueOf(value: String): EE /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt b/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt index 7dd2e8eee44..ba193083af0 100644 --- a/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt +++ b/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt @@ -88,6 +88,10 @@ FILE fqName: fileName:/enumEntry.kt FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.Z VALUE_PARAMETER name:value index:0 type:kotlin.String SYNTHETIC_BODY kind=ENUM_VALUEOF + PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + FUN ENUM_CLASS_SPECIAL_MEMBER name: visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries + correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val] + SYNTHETIC_BODY kind=ENUM_ENTRIES FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: protected final fun clone (): kotlin.Any declared in kotlin.Enum diff --git a/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt b/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt index 9f52d48ef76..8a4f98da5dd 100644 --- a/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt +++ b/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt @@ -35,4 +35,8 @@ open enum class Z : Enum { fun valueOf(value: String): Z /* Synthetic body for ENUM_VALUEOF */ + val entries: EnumEntries + get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */ + } + diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt index 05cee3beef8..b015fc7b623 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -12,10 +12,10 @@ public/*package*/ open class A3() } -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -27,10 +27,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt index 6b453ea2e8a..4e652aec866 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -6,13 +6,13 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G1 { } - public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { + public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { } public/*package*/ interface G11..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!> where _A : test.ClassTypeParameterBounds.I2!>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>!>)>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } - public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { + public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } public/*package*/ open inner class G2 { diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt index 9df7a2107c5..719fa5aca50 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,9 +5,9 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ p0: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? - public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? + public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ p0: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt index e4c18a96607..da8dc1ece74 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ReturnType.txt @@ -14,41 +14,41 @@ public/*package*/ interface ReturnType { public abstract fun f1(): test.G1!>!>!>! public abstract fun f11(): test.G2, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f13(): (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) - public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray! + public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public abstract fun f15(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public abstract fun f16(): kotlin.IntArray! @org.jetbrains.annotations.NotNull public abstract fun f17(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public abstract fun f19(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>) public abstract fun f2(): test.G1<@org.jetbrains.annotations.NotNull kotlin.String>! - public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) - @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) + public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) @org.jetbrains.annotations.NotNull public abstract fun f23(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>) - public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f26(): kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! @org.jetbrains.annotations.NotNull public abstract fun f27(): kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public abstract fun f28(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f29(): test.G2! + public abstract fun f29(): test.G2! public abstract fun f3(): test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f30(): test.G1!>! public abstract fun f31(): test.G1!>! - public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>! - public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>! + public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f34(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f36(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>! public abstract fun f37(): test.G1!>!>!>! - public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! + public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! public abstract fun f39(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! public abstract fun f40(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f41(): test.G2! + public abstract fun f41(): test.G2! public abstract fun f42(): test.G1!>! public abstract fun f43(): test.G1!>! - public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public abstract fun f46(): test.G1! + public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public abstract fun f46(): test.G1! public abstract fun f47(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f49(): test.G1!>!>!>!>!>! public abstract fun f5(): test.G1!>!>!>! public abstract fun f50(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! - public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! + public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! public abstract fun f53(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! public abstract fun f6(): test.G1! public abstract fun f7(): test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @@ -63,25 +63,25 @@ public/*package*/ interface ReturnType { @org.jetbrains.annotations.NotNull public/*package*/ final var f182: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f183: test.G1<@org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public/*package*/ final var f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public/*package*/ final var f4: test.G1! - public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public/*package*/ final var f48: test.G2!>!>! - public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public/*package*/ final var f48: test.G2!>!>! + public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } // Static members public final val f10: test.G1! public final val f12: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @org.jetbrains.annotations.NotNull public final val f161: kotlin.IntArray! - @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray! + @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public final val f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) @org.jetbrains.annotations.NotNull public final val f271: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public final val f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public final val f4: test.G1! - public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public final val f48: test.G2!>!>! - public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public final val f48: test.G2!>!>! + public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt index 99fac565481..4f37e86fb27 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ValueArguments.txt @@ -16,56 +16,56 @@ public/*package*/ interface ValueArguments { public abstract fun f11(/*0*/ p0: test.G2?, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f12(/*0*/ p0: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f13(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f14(/*0*/ p0: @org.jetbrains.annotations.NotNull kotlin.IntArray!): kotlin.Unit + public abstract fun f14(/*0*/ p0: @org.jetbrains.annotations.NotNull kotlin.IntArray): kotlin.Unit public abstract fun f15(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!): kotlin.Unit public abstract fun f16(/*0*/ @org.jetbrains.annotations.Nullable p0: kotlin.IntArray!): kotlin.Unit public abstract fun f17(/*0*/ @org.jetbrains.annotations.Nullable p0: (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Int?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)): kotlin.Unit - public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p0: @org.jetbrains.annotations.Nullable kotlin.IntArray!, /*1*/ p1: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p2: kotlin.IntArray!): kotlin.Unit + public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p0: @org.jetbrains.annotations.Nullable kotlin.IntArray?, /*1*/ p1: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p2: kotlin.IntArray!): kotlin.Unit public abstract fun f19(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)): kotlin.Unit public abstract fun f2(/*0*/ p0: test.G1<@org.jetbrains.annotations.NotNull kotlin.String>!): kotlin.Unit - public abstract fun f20(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f20(/*0*/ p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit public abstract fun f21(/*0*/ @org.jetbrains.annotations.NotNull p0: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit - public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit + public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit public abstract fun f23(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>)): kotlin.Unit - public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f25(/*0*/ p0: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!): kotlin.Unit - public abstract fun f26(/*0*/ p0: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p1: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!, /*2*/ @org.jetbrains.annotations.Nullable p2: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit + public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f25(/*0*/ p0: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!): kotlin.Unit + public abstract fun f26(/*0*/ p0: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p1: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!, /*2*/ @org.jetbrains.annotations.Nullable p2: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit public abstract fun f27(/*0*/ @org.jetbrains.annotations.Nullable p0: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Any?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!>!): kotlin.Unit public abstract fun f28(/*0*/ p0: test.G1<(@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit - public abstract fun f29(/*0*/ p0: test.G2!): kotlin.Unit + public abstract fun f29(/*0*/ p0: test.G2!): kotlin.Unit public abstract fun f3(/*0*/ p0: test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f30(/*0*/ p0: test.G1!>!): kotlin.Unit public abstract fun f31(/*0*/ p0: test.G1!>!): kotlin.Unit - public abstract fun f32(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!): kotlin.Unit - public abstract fun f33(/*0*/ p0: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!): kotlin.Unit + public abstract fun f32(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!): kotlin.Unit + public abstract fun f33(/*0*/ p0: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!): kotlin.Unit public abstract fun f34(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit public abstract fun f35(/*0*/ p0: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*1*/ p1: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!, /*2*/ p2: test.G1!>!): kotlin.Unit public abstract fun f36(/*0*/ p0: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!): kotlin.Unit public abstract fun f37(/*0*/ p0: test.G1!>!>!>!): kotlin.Unit - public abstract fun f38(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit + public abstract fun f38(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit public abstract fun f39(/*0*/ p0: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!): kotlin.Unit public abstract fun f4(/*0*/ p0: test.G1!): kotlin.Unit public abstract fun f40(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f41(/*0*/ p0: test.G2!): kotlin.Unit + public abstract fun f41(/*0*/ p0: test.G2!): kotlin.Unit public abstract fun f42(/*0*/ p0: test.G1!>!): kotlin.Unit public abstract fun f43(/*0*/ p0: test.G1!>!): kotlin.Unit - public abstract fun f44(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f45(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f46(/*0*/ p0: test.G1!): kotlin.Unit + public abstract fun f44(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f45(/*0*/ p0: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f46(/*0*/ p0: test.G1!): kotlin.Unit public abstract fun f47(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f48(/*0*/ p0: test.G2!>!>!): kotlin.Unit - public abstract fun f49(/*0*/ p0: test.G1!>!>!>!>!>!, /*1*/ p1: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p2: test.G2!>!>!): kotlin.Unit + public abstract fun f48(/*0*/ p0: test.G2!>!>!): kotlin.Unit + public abstract fun f49(/*0*/ p0: test.G1!>!>!>!>!>!, /*1*/ p1: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p2: test.G2!>!>!): kotlin.Unit public abstract fun f5(/*0*/ p0: test.G1!>!>!>!): kotlin.Unit public abstract fun f50(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f51(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit - public abstract fun f52(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit + public abstract fun f51(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit + public abstract fun f52(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit public abstract fun f53(/*0*/ p0: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f54(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p1: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p2: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p3: @org.jetbrains.annotations.NotNull kotlin.IntArray!, /*4*/ p4: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit + public abstract fun f54(/*0*/ p0: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p1: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p2: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p3: @org.jetbrains.annotations.NotNull kotlin.IntArray, /*4*/ p4: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f55(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.String /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!*/): kotlin.Unit public abstract fun f56(/*0*/ vararg p0: kotlin.String! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f57(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.String /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f58(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit - public abstract fun f59(/*0*/ vararg p0: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray!*/): kotlin.Unit + public abstract fun f59(/*0*/ vararg p0: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray*/): kotlin.Unit public abstract fun f6(/*0*/ p0: test.G1!, /*1*/ p1: test.G1!>!>!>!): kotlin.Unit public abstract fun f60(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Int /*@org.jetbrains.annotations.Nullable kotlin.IntArray!*/): kotlin.Unit public abstract fun f61(/*0*/ @org.jetbrains.annotations.Nullable vararg p0: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>! /*kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>!>!*/): kotlin.Unit @@ -74,8 +74,8 @@ public/*package*/ interface ValueArguments { public abstract fun f64(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array) /*(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)*/): kotlin.Unit public abstract fun f65(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.IntArray! /*kotlin.Array<(out) kotlin.IntArray!>!*/): kotlin.Unit public abstract fun f66(/*0*/ vararg p0: kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit - public abstract fun f67(/*0*/ vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!*/): kotlin.Unit - public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit + public abstract fun f67(/*0*/ vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!*/): kotlin.Unit + public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: @org.jetbrains.annotations.NotNull kotlin.IntArray /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f69(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>!>!*/): kotlin.Unit public abstract fun f7(/*0*/ p0: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f70(/*0*/ vararg p0: (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?) /*kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>!*/): kotlin.Unit @@ -83,12 +83,12 @@ public/*package*/ interface ValueArguments { public abstract fun f72(/*0*/ @org.jetbrains.annotations.Nullable vararg p0: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.String?>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! /*(@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>..@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>?)*/): kotlin.Unit public abstract fun f73(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) /*kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!*/): kotlin.Unit public abstract fun f74(/*0*/ vararg p0: kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>)*/): kotlin.Unit - public abstract fun f75(/*0*/ vararg p0: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!*/): kotlin.Unit - public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit + public abstract fun f75(/*0*/ vararg p0: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!*/): kotlin.Unit + public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg p0: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit public abstract fun f8(/*0*/ p0: test.G1!): kotlin.Unit public abstract fun f9(/*0*/ p0: test.G1!>!>!>!): kotlin.Unit public open class Test { - public constructor Test(/*0*/ p0: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!, /*3*/ @org.jetbrains.annotations.NotNull p3: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p4: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) + public constructor Test(/*0*/ p0: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!, /*3*/ @org.jetbrains.annotations.NotNull p3: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p4: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) } } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt index e24d09f9faa..c50e6fa3c4b 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -1,9 +1,9 @@ package test -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -15,10 +15,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt index 6b453ea2e8a..4e652aec866 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -6,13 +6,13 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G1 { } - public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { + public/*package*/ interface G10!> where _A : test.ClassTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { } public/*package*/ interface G11..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!> where _A : test.ClassTypeParameterBounds.I2!>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>!>)>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } - public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { + public/*package*/ interface G12?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!> where _A : test.ClassTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>!> { } public/*package*/ open inner class G2 { diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt index c487715c9b1..ea5e118aa44 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,9 +5,9 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ x: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? - public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? + public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ x: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt index dbfb19c32bf..3127994d1a8 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ReturnType.txt @@ -5,41 +5,41 @@ public/*package*/ interface ReturnType { public abstract fun f1(): test.G1!>!>!>! public abstract fun f11(): test.G2, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f13(): (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) - public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray! + public abstract fun f14(): @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public abstract fun f15(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public abstract fun f16(): kotlin.IntArray! @org.jetbrains.annotations.NotNull public abstract fun f17(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public abstract fun f19(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>) public abstract fun f2(): test.G1<@org.jetbrains.annotations.NotNull kotlin.String>! - public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) - @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) + public abstract fun f20(): (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public abstract fun f22(): (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>) @org.jetbrains.annotations.NotNull public abstract fun f23(): (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>) - public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f25(): kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f26(): kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! @org.jetbrains.annotations.NotNull public abstract fun f27(): kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public abstract fun f28(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f29(): test.G2! + public abstract fun f29(): test.G2! public abstract fun f3(): test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! public abstract fun f30(): test.G1!>! public abstract fun f31(): test.G1!>! - public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>! - public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>! + public abstract fun f32(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>! + public abstract fun f33(): test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>! public abstract fun f34(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f36(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>! public abstract fun f37(): test.G1!>!>!>! - public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! + public abstract fun f38(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>! public abstract fun f39(): test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! public abstract fun f40(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! - public abstract fun f41(): test.G2! + public abstract fun f41(): test.G2! public abstract fun f42(): test.G1!>! public abstract fun f43(): test.G1!>! - public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public abstract fun f46(): test.G1! + public abstract fun f44(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public abstract fun f46(): test.G1! public abstract fun f47(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! public abstract fun f49(): test.G1!>!>!>!>!>! public abstract fun f5(): test.G1!>!>!>! public abstract fun f50(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! - public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! + public abstract fun f51(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>! public abstract fun f53(): test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>! public abstract fun f6(): test.G1! public abstract fun f7(): test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @@ -54,25 +54,25 @@ public/*package*/ interface ReturnType { @org.jetbrains.annotations.NotNull public/*package*/ final var f182: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Int>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f183: test.G1<@org.jetbrains.annotations.NotNull kotlin.Int>! @org.jetbrains.annotations.NotNull public/*package*/ final var f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public/*package*/ final var f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) public/*package*/ final var f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public/*package*/ final var f4: test.G1! - public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public/*package*/ final var f48: test.G2!>!>! - public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public/*package*/ final var f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public/*package*/ final var f48: test.G2!>!>! + public/*package*/ final var f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } // Static members public final val f10: test.G1! public final val f12: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! @org.jetbrains.annotations.NotNull public final val f161: kotlin.IntArray! - @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray! + @org.jetbrains.annotations.NotNull public final val f18: @org.jetbrains.annotations.NotNull kotlin.IntArray @org.jetbrains.annotations.NotNull public final val f21: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>! - @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array) + @org.jetbrains.annotations.NotNull public final val f24: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array) @org.jetbrains.annotations.NotNull public final val f271: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>! public final val f35: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>! public final val f4: test.G1! - public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! - public final val f48: test.G2!>!>! - public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! + public final val f45: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>! + public final val f48: test.G2!>!>! + public final val f52: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>! } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt index 4c52542bfef..246fa6419a5 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ValueArguments.txt @@ -7,56 +7,56 @@ public/*package*/ interface ValueArguments { public abstract fun f11(/*0*/ p: test.G2?, in @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f12(/*0*/ p: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f13(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f14(/*0*/ p: @org.jetbrains.annotations.NotNull kotlin.IntArray!): kotlin.Unit + public abstract fun f14(/*0*/ p: @org.jetbrains.annotations.NotNull kotlin.IntArray): kotlin.Unit public abstract fun f15(/*0*/ @org.jetbrains.annotations.NotNull p: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!): kotlin.Unit public abstract fun f16(/*0*/ @org.jetbrains.annotations.Nullable p: kotlin.IntArray!): kotlin.Unit public abstract fun f17(/*0*/ @org.jetbrains.annotations.Nullable p: (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Int?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)): kotlin.Unit - public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p1: @org.jetbrains.annotations.Nullable kotlin.IntArray!, /*1*/ p2: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p3: kotlin.IntArray!): kotlin.Unit + public abstract fun f18(/*0*/ @org.jetbrains.annotations.Nullable p1: @org.jetbrains.annotations.Nullable kotlin.IntArray?, /*1*/ p2: (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?), /*2*/ @org.jetbrains.annotations.Nullable p3: kotlin.IntArray!): kotlin.Unit public abstract fun f19(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)): kotlin.Unit public abstract fun f2(/*0*/ p: test.G1<@org.jetbrains.annotations.NotNull kotlin.String>!): kotlin.Unit - public abstract fun f20(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f20(/*0*/ p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit public abstract fun f21(/*0*/ @org.jetbrains.annotations.NotNull p: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit - public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit + public abstract fun f22(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>)): kotlin.Unit public abstract fun f23(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!>)): kotlin.Unit - public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit - public abstract fun f25(/*0*/ p: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!): kotlin.Unit - public abstract fun f26(/*0*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray!>!, /*2*/ @org.jetbrains.annotations.Nullable p3: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit + public abstract fun f24(/*0*/ @org.jetbrains.annotations.NotNull p: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)): kotlin.Unit + public abstract fun f25(/*0*/ p: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!): kotlin.Unit + public abstract fun f26(/*0*/ p1: kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, /*1*/ p2: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.IntArray?>!, /*2*/ @org.jetbrains.annotations.Nullable p3: (@org.jetbrains.annotations.Nullable kotlin.Array<(@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>?)): kotlin.Unit public abstract fun f27(/*0*/ @org.jetbrains.annotations.Nullable p: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.Any?>?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!>!): kotlin.Unit public abstract fun f28(/*0*/ p: test.G1<(@org.jetbrains.annotations.Nullable kotlin.Array?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit - public abstract fun f29(/*0*/ p: test.G2!): kotlin.Unit + public abstract fun f29(/*0*/ p: test.G2!): kotlin.Unit public abstract fun f3(/*0*/ p: test.G2<@org.jetbrains.annotations.NotNull kotlin.String, test.G2<@org.jetbrains.annotations.NotNull kotlin.Int, test.G2<@org.jetbrains.annotations.NotNull test.G2, @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f30(/*0*/ p: test.G1!>!): kotlin.Unit public abstract fun f31(/*0*/ p: test.G1!>!): kotlin.Unit - public abstract fun f32(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!): kotlin.Unit - public abstract fun f33(/*0*/ p: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray!>!): kotlin.Unit + public abstract fun f32(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!): kotlin.Unit + public abstract fun f33(/*0*/ p: test.G1<@org.jetbrains.annotations.NotNull kotlin.IntArray>!): kotlin.Unit public abstract fun f34(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit public abstract fun f35(/*0*/ p1: test.G2..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*1*/ p2: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!, /*2*/ p3: test.G1!>!): kotlin.Unit public abstract fun f36(/*0*/ p: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>!): kotlin.Unit public abstract fun f37(/*0*/ p: test.G1!>!>!>!): kotlin.Unit - public abstract fun f38(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit + public abstract fun f38(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!, test.G1!>!>!>!>!): kotlin.Unit public abstract fun f39(/*0*/ p: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!): kotlin.Unit public abstract fun f4(/*0*/ p: test.G1!): kotlin.Unit public abstract fun f40(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f41(/*0*/ p: test.G2!): kotlin.Unit + public abstract fun f41(/*0*/ p: test.G2!): kotlin.Unit public abstract fun f42(/*0*/ p: test.G1!>!): kotlin.Unit public abstract fun f43(/*0*/ p: test.G1!>!): kotlin.Unit - public abstract fun f44(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f45(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit - public abstract fun f46(/*0*/ p: test.G1!): kotlin.Unit + public abstract fun f44(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f45(/*0*/ p: test.G1?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, test.G1!>!>!): kotlin.Unit + public abstract fun f46(/*0*/ p: test.G1!): kotlin.Unit public abstract fun f47(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f48(/*0*/ p: test.G2!>!>!): kotlin.Unit - public abstract fun f49(/*0*/ p1: test.G1!>!>!>!>!>!, /*1*/ p2: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p3: test.G2!>!>!): kotlin.Unit + public abstract fun f48(/*0*/ p: test.G2!>!>!): kotlin.Unit + public abstract fun f49(/*0*/ p1: test.G1!>!>!>!>!>!, /*1*/ p2: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, /*2*/ p3: test.G2!>!>!): kotlin.Unit public abstract fun f5(/*0*/ p: test.G1!>!>!>!): kotlin.Unit public abstract fun f50(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!): kotlin.Unit - public abstract fun f51(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit - public abstract fun f52(/*0*/ p: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit + public abstract fun f51(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!, test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>!>!): kotlin.Unit + public abstract fun f52(/*0*/ p: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!): kotlin.Unit public abstract fun f53(/*0*/ p: test.G1..@org.jetbrains.annotations.NotNull kotlin.Array)>!): kotlin.Unit - public abstract fun f54(/*0*/ p1: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p2: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p3: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p4: @org.jetbrains.annotations.NotNull kotlin.IntArray!, /*4*/ p5: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit + public abstract fun f54(/*0*/ p1: test.G1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.G1!>!>!>!, /*1*/ p2: test.G1<(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!, /*2*/ @org.jetbrains.annotations.NotNull p3: kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.Any>..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>!>!, /*3*/ @org.jetbrains.annotations.NotNull p4: @org.jetbrains.annotations.NotNull kotlin.IntArray, /*4*/ p5: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f55(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.String /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!*/): kotlin.Unit public abstract fun f56(/*0*/ vararg x: kotlin.String! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f57(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.String /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f58(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit - public abstract fun f59(/*0*/ vararg x: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray!*/): kotlin.Unit + public abstract fun f59(/*0*/ vararg x: kotlin.Int /*@org.jetbrains.annotations.NotNull kotlin.IntArray*/): kotlin.Unit public abstract fun f6(/*0*/ p1: test.G1!, /*1*/ p2: test.G1!>!>!>!): kotlin.Unit public abstract fun f60(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Int /*@org.jetbrains.annotations.Nullable kotlin.IntArray!*/): kotlin.Unit public abstract fun f61(/*0*/ @org.jetbrains.annotations.Nullable vararg x: kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>! /*kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.Nullable kotlin.String?>!>!*/): kotlin.Unit @@ -65,8 +65,8 @@ public/*package*/ interface ValueArguments { public abstract fun f64(/*0*/ @org.jetbrains.annotations.NotNull vararg x: (@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array) /*(@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)*/): kotlin.Unit public abstract fun f65(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.IntArray! /*kotlin.Array<(out) kotlin.IntArray!>!*/): kotlin.Unit public abstract fun f66(/*0*/ vararg x: kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit - public abstract fun f67(/*0*/ vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!*/): kotlin.Unit - public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray! /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray!>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit + public abstract fun f67(/*0*/ vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray /*kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!*/): kotlin.Unit + public abstract fun f68(/*0*/ @org.jetbrains.annotations.NotNull vararg x: @org.jetbrains.annotations.NotNull kotlin.IntArray /*(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.IntArray>..@org.jetbrains.annotations.NotNull kotlin.Array)*/): kotlin.Unit public abstract fun f69(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.String>!>!>!*/): kotlin.Unit public abstract fun f7(/*0*/ p: test.G2, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!): kotlin.Unit public abstract fun f70(/*0*/ vararg x: (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?) /*kotlin.Array<(out) (@org.jetbrains.annotations.Nullable kotlin.Array!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>?)>!*/): kotlin.Unit @@ -74,12 +74,12 @@ public/*package*/ interface ValueArguments { public abstract fun f72(/*0*/ @org.jetbrains.annotations.Nullable vararg x: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array<@org.jetbrains.annotations.Nullable kotlin.String?>..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>! /*(@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>..@org.jetbrains.annotations.Nullable kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>)>!>?)*/): kotlin.Unit public abstract fun f73(/*0*/ @org.jetbrains.annotations.NotNull vararg x: (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array) /*kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!*/): kotlin.Unit public abstract fun f74(/*0*/ vararg x: kotlin.Array<(out) kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>..@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!>)*/): kotlin.Unit - public abstract fun f75(/*0*/ vararg x: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!>!>!*/): kotlin.Unit - public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit + public abstract fun f75(/*0*/ vararg x: kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>! /*kotlin.Array<(out) kotlin.Array<(out) kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!>!>!*/): kotlin.Unit + public abstract fun f76(/*0*/ @org.jetbrains.annotations.NotNull vararg x: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/): kotlin.Unit public abstract fun f8(/*0*/ p: test.G1!): kotlin.Unit public abstract fun f9(/*0*/ p: test.G1!>!>!>!): kotlin.Unit public open class Test { - public constructor Test(/*0*/ p1: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p2: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p3: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>!, /*3*/ @org.jetbrains.annotations.NotNull p4: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p5: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray!>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) + public constructor Test(/*0*/ p1: test.G2?, out @org.jetbrains.annotations.NotNull kotlin.Int>!>!>!, /*1*/ p2: kotlin.Array<(out) (@org.jetbrains.annotations.NotNull kotlin.Array..@org.jetbrains.annotations.NotNull kotlin.Array)>!, /*2*/ p3: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>!, /*3*/ @org.jetbrains.annotations.NotNull p4: (@org.jetbrains.annotations.NotNull kotlin.Array<(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>..@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)>), /*4*/ @org.jetbrains.annotations.NotNull vararg p5: kotlin.Array<(out) @org.jetbrains.annotations.NotNull kotlin.IntArray>! /*(@org.jetbrains.annotations.NotNull kotlin.Array!>..@org.jetbrains.annotations.NotNull kotlin.Array!>)*/) } } 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 7036b18200b..76b24ae786e 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 @@ -16563,12 +16563,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/enum/noClassForSimpleEnum.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -19610,12 +19604,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -19628,12 +19616,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() 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 35a7bb74881..c878a1c434a 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 @@ -16857,12 +16857,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/enum/noClassForSimpleEnum.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -20426,12 +20420,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -20444,12 +20432,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java index d77d24c74d8..06bd5ca5896 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java @@ -232,12 +232,6 @@ public class IrTextTestGenerated extends AbstractIrTextTest { runTest("compiler/testData/ir/irText/classes/kt43217.kt"); } - @Test - @TestMetadata("kt44013.kt") - public void testKt44013() throws Exception { - runTest("compiler/testData/ir/irText/classes/kt44013.kt"); - } - @Test @TestMetadata("kt45853.kt") public void testKt45853() throws Exception { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java index afced777590..33b100c4509 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.integration; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.common.CompilerSystemProperties; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import java.io.File; @@ -39,6 +40,7 @@ public abstract class AbstractAntTaskTest extends KotlinIntegrationTestBase { testDataDir, "build.log", "-Xmx256m", + "-D" + CompilerSystemProperties.KOTLIN_JS_COMPILER_LEGACY_FORCE_ENABLED.getProperty() + "=true", "-Dkotlin.lib=" + KotlinIntegrationTestBase.getCompilerLib(), "-Dkotlin.runtime.jar=" + ForTestCompileRuntime.runtimeJarForTests().getAbsolutePath(), "-Dkotlin.reflect.jar=" + ForTestCompileRuntime.reflectJarForTests().getAbsolutePath(), diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 3eda2e53fb5..8bbb6063dd3 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -13659,11 +13659,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/enum/noClassForSimpleEnum.kt"); } - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { runTest("compiler/testData/codegen/box/enum/ordinal.kt"); @@ -16324,11 +16319,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/kt48633.kt"); @@ -16339,11 +16329,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/kt51988.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt index 169f42cf1f1..ecc81827a3b 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt @@ -146,9 +146,11 @@ class LauncherScriptTest : TestCaseWithTmpdir() { "-nowarn", "-Xlegacy-deprecated-no-warn", "-Xuse-deprecated-legacy-compiler", + // TODO: It will be deleted after all of our internal vendors will use the new Kotlin/JS compiler "-D${CompilerSystemProperties.KOTLIN_JS_COMPILER_LEGACY_FORCE_ENABLED.property}=true", "-output", File(tmpdir, "out.js").path, + environment = mapOf("JAVA_HOME" to KtTestUtil.getJdk8Home().absolutePath) ) } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt index c602cc6a057..bb0d6b9c6fa 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt @@ -771,23 +771,23 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration ) } ) - val library15 = compileLibrary( - "library15", - additionalOptions = listOf("-language-version", "1.5") + val library16 = compileLibrary( + "library16", + additionalOptions = listOf("-language-version", "1.6") ) compileKotlin( "expectActualLv14.kt", output = tmpdir, - classpath = listOf(library14, library15), + classpath = listOf(library14, library16), additionalOptions = listOf("-language-version", "1.4", "-Xmulti-platform"), expectedFileName = "output14.txt", ) compileKotlin( - "expectActualLv15.kt", + "expectActualLv16.kt", output = tmpdir, - classpath = listOf(library14, library15), - additionalOptions = listOf("-language-version", "1.5", "-Xmulti-platform"), - expectedFileName = "output15.txt", + classpath = listOf(library14, library16), + additionalOptions = listOf("-language-version", "1.6", "-Xmulti-platform"), + expectedFileName = "output16.txt", ) } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java index f6bf8bc5beb..6b4d94ca0b7 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java @@ -12785,12 +12785,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -15238,12 +15232,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -15256,12 +15244,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index 93a6c327f52..66dd286296f 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -12881,12 +12881,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -15256,12 +15250,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -15274,12 +15262,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index 2354b698a5b..35842b310b2 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -12881,12 +12881,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -15256,12 +15250,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -15274,12 +15262,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index 21a5876f1d1..d6679226f5a 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -12881,12 +12881,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -15256,12 +15250,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -15274,12 +15262,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java index ac96c3850a4..bd7ec6066b6 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java @@ -11419,11 +11419,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt"); } - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { runTest("compiler/testData/codegen/box/enum/ordinal.kt"); @@ -13589,21 +13584,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @TestMetadata("kt49887.kt") public void testKt49887() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { runTest("compiler/testData/codegen/box/inference/builderInference/kt51988.kt"); diff --git a/js/js.translator/testData/lineNumbers/enumCompanionObject.kt b/js/js.translator/testData/lineNumbers/enumCompanionObject.kt index 4be00727463..c61af71a6ca 100644 --- a/js/js.translator/testData/lineNumbers/enumCompanionObject.kt +++ b/js/js.translator/testData/lineNumbers/enumCompanionObject.kt @@ -7,4 +7,4 @@ enum class Foo { } // LINES(JS): 1 1 1 1 1 1 1 1 1 2 2 4 * 2 2 2 2 4 4 5 5 * 4 4 4 4 4 4 4 * 1 1 1 * 1 1 1 1 1 1 -// LINES(JS_IR): 4 4 * 5 5 5 5 5 * 1 * 1 1 * 1 1 +// LINES(JS_IR): 4 4 * 5 5 5 5 5 * 1 * 1 1 * 1 * 1 1 diff --git a/js/js.translator/testData/lineNumbers/enumObject.kt b/js/js.translator/testData/lineNumbers/enumObject.kt index e941d3d1cfc..f08043e98fc 100644 --- a/js/js.translator/testData/lineNumbers/enumObject.kt +++ b/js/js.translator/testData/lineNumbers/enumObject.kt @@ -11,4 +11,4 @@ enum class E { } // LINES(JS): 1 1 1 1 1 1 1 1 1 2 2 4 8 * 2 2 2 2 4 4 4 5 5 5 * 4 4 4 4 8 8 8 9 9 9 * 8 8 8 8 * 1 1 1 * 1 1 1 1 1 1 1 1 1 1 -// LINES(JS_IR): 4 4 * 5 5 5 * 8 8 * 9 9 9 * 1 * 1 1 * 1 1 +// LINES(JS_IR): 4 4 * 5 5 5 * 8 8 * 9 9 9 * 1 * 1 1 * 1 * 1 1 diff --git a/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt b/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt index c2567746ff6..62d017a68a8 100644 --- a/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt +++ b/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt @@ -9,4 +9,4 @@ enum class E { } // LINES(JS): 1 1 1 1 1 1 1 1 1 2 2 3 3 4 * 2 2 2 2 * 3 3 3 3 4 4 4 6 6 * 4 4 4 4 * 1 1 1 * 1 1 1 1 1 1 1 1 1 1 -// LINES(JS_IR): 4 4 * 6 6 * 1 * 1 1 * 1 1 +// LINES(JS_IR): 4 4 * 6 6 * 1 * 1 1 * 1 * 1 1 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt index 4242defe840..3d1e857da58 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExecutionStrategyIT.kt @@ -239,17 +239,24 @@ abstract class ExecutionStrategyIT : KGPDaemonsBaseTest() { } protected open fun setupProject(project: TestProject) { - project.subProject("app").buildGradle.append( - //language=Groovy - """ - | - |tasks - | .withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile) - | .configureEach { - | kotlinOptions.allWarningsAsErrors = true - | } - """.trimMargin() - ) + project.subProject("app").apply { + buildGradle.append( + //language=Groovy + """ + |tasks + | .withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile) + | .configureEach { + | kotlinOptions.allWarningsAsErrors = true + | } + | + |tasks + | .withType(org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile) + | .configureEach { + | kotlinOptions.allWarningsAsErrors = false + | } + """.trimMargin() + ) + } } protected abstract fun BuildResult.checkOutput(project: TestProject) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/gradle.properties index e69de29bb2d..ee12306eea2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/gradle.properties index e69de29bb2d..ee12306eea2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/gradle.properties index e69de29bb2d..ee12306eea2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/gradle.properties index e69de29bb2d..ee12306eea2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/gradle.properties index 5de000d1dda..e0746025cb7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/gradle.properties @@ -1,2 +1,3 @@ kotlin.incremental.js.klib=true -kotlin.incremental.js.ir=true \ No newline at end of file +kotlin.incremental.js.ir=true +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/gradle.properties new file mode 100644 index 00000000000..743d692ce15 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/gradle.properties @@ -0,0 +1,13 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/gradle.properties new file mode 100644 index 00000000000..502e71d683a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/gradle.properties @@ -0,0 +1,14 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/gradle.properties index a0b65881e1b..ee12306eea2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/gradle.properties @@ -1 +1 @@ -kotlin.js.compiler=legacy \ No newline at end of file +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/app/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/gradle.properties index a0b65881e1b..6b8a3647ea2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/gradle.properties @@ -1 +1,2 @@ -kotlin.js.compiler=legacy \ No newline at end of file +kotlin.js.compiler=legacy +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-jvm-js-ic/lib/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-without-kotlin/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-without-kotlin/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-without-kotlin/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/gradle.properties new file mode 100644 index 00000000000..5bb57d50f23 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-external-lib/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-common/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/gradle.properties index a4a181c3de2..1a07cc56e07 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/gradle.properties @@ -1 +1,2 @@ -kotlin.tests.individualTaskReports=true \ No newline at end of file +kotlin.tests.individualTaskReports=true +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties index a8518e0d1ea..4f5862bf926 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-published/gradle.properties @@ -1 +1,2 @@ -kotlin.mpp.enableCompatibilityMetadataVariant=true \ No newline at end of file +kotlin.mpp.enableCompatibilityMetadataVariant=true +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-js/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-js/gradle.properties new file mode 100644 index 00000000000..ee12306eea2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-js/gradle.properties @@ -0,0 +1 @@ +kotlin.daemon.jvmargs=-Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld-kts/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld-kts/pom.xml index 42e99f6f587..8fccd5d32ef 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld-kts/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld-kts/pom.xml @@ -58,6 +58,11 @@ compile + + + -Xallow-any-scripts-in-source-roots + + test-compile @@ -79,4 +84,4 @@ - \ No newline at end of file + diff --git a/libraries/tools/kotlinp/testData/NestedClasses.txt b/libraries/tools/kotlinp/testData/NestedClasses.txt index ac02ec4c155..760e0db7bac 100644 --- a/libraries/tools/kotlinp/testData/NestedClasses.txt +++ b/libraries/tools/kotlinp/testData/NestedClasses.txt @@ -49,6 +49,8 @@ public final enum class A.D.E : kotlin/Enum { E2, // module name: test-module + + // has Enum.entries } // A$D$F.class // ------------------------------------------ diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java index 4faf2ba3fc1..2f0db431a91 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java @@ -14054,12 +14054,6 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -16588,12 +16582,6 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -16606,12 +16594,6 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { 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 83d9962d250..1c667a0c183 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 @@ -13891,12 +13891,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/enum/manyDefaultParameters.kt"); } - @Test - @TestMetadata("objectInEnum.kt") - public void testObjectInEnum() throws Exception { - runTest("compiler/testData/codegen/box/enum/objectInEnum.kt"); - } - @Test @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { @@ -16398,12 +16392,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/inference/builderInference/kt47744.kt"); } - @Test - @TestMetadata("kt48445.kt") - public void testKt48445() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt48445.kt"); - } - @Test @TestMetadata("kt48633.kt") public void testKt48633() throws Exception { @@ -16416,12 +16404,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/inference/builderInference/kt49887.kt"); } - @Test - @TestMetadata("kt50520.kt") - public void testKt50520() throws Exception { - runTest("compiler/testData/codegen/box/inference/builderInference/kt50520.kt"); - } - @Test @TestMetadata("kt51988.kt") public void testKt51988() throws Exception { diff --git a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.fir.txt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.fir.txt new file mode 100644 index 00000000000..88aa96262cc --- /dev/null +++ b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.fir.txt @@ -0,0 +1,46 @@ +@AllOpen +@java.lang.annotation.Retention(value=RUNTIME) +@kotlin.Metadata +public annotation class AllOpen { + // source: 'allOpenOnNotClasses.kt' +} + +@AllOpen +@kotlin.Metadata +public final enum class Enum { + // source: 'allOpenOnNotClasses.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries + private synthetic final static field $VALUES: Enum[] + private synthetic final static method $entries(): Enum[] + private synthetic final static method $values(): Enum[] + static method (): void + private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries + public static method valueOf(p0: java.lang.String): Enum + public static method values(): Enum[] +} + +@AllOpen +@kotlin.Metadata +public interface Intf { + // source: 'allOpenOnNotClasses.kt' +} + +@kotlin.Metadata +public final class MyClass { + // source: 'allOpenOnNotClasses.kt' + private @AllOpen @org.jetbrains.annotations.NotNull field prop: java.lang.String + public method (): void + public final @AllOpen @org.jetbrains.annotations.NotNull method getProp(): java.lang.String + public final @AllOpen method method(): void + public final @AllOpen method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void +} + +@AllOpen +@kotlin.Metadata +public final class Obj { + // source: 'allOpenOnNotClasses.kt' + public final static @org.jetbrains.annotations.NotNull field INSTANCE: Obj + static method (): void + private method (): void +} diff --git a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt index 12c65dfbfa6..e6fddd96bbe 100644 --- a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt +++ b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.ir.txt @@ -9,7 +9,9 @@ public annotation class AllOpen { @kotlin.Metadata public final enum class Enum { // source: 'allOpenOnNotClasses.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: Enum[] + private synthetic final static method $entries(): Enum[] private synthetic final static method $values(): Enum[] static method (): void private method (p0: java.lang.String, p1: int): void diff --git a/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt b/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt index b7e26629e3e..f4ad7d29c65 100644 --- a/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt +++ b/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt @@ -1,12 +1,15 @@ @kotlin.Metadata final enum class TraceTest$Status { // source: 'TraceTest.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: TraceTest$Status[] public final enum static field END: TraceTest$Status public final enum static field START: TraceTest$Status + private synthetic final static method $entries(): TraceTest$Status[] private synthetic final static method $values(): TraceTest$Status[] static method (): void private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): TraceTest$Status public static method values(): TraceTest$Status[] private final inner class TraceTest$Status diff --git a/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt b/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt index 93c9a98614a..5756c736887 100644 --- a/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt +++ b/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt @@ -5,10 +5,11 @@ public final enum class test/E { public final enum static field B: test.E public static method values(): test.E[] public static method valueOf(p0: java.lang.String): test.E + public static method getEntries(): kotlin.enums.EnumEntries } @kotlin.Metadata public final class test/Test { // source: 'test.kt' public method (): void public final @org.jetbrains.annotations.NotNull method anonymousWhenMapping(@org.jetbrains.annotations.NotNull p0: test.E): java.lang.String -} \ No newline at end of file +} diff --git a/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt b/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt index 4578a8a45a8..45ae05cfd09 100644 --- a/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt +++ b/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt @@ -5,6 +5,7 @@ public final enum class test/E { public final enum static field B: test.E public static method values(): test.E[] public static method valueOf(p0: java.lang.String): test.E + public static method getEntries(): kotlin.enums.EnumEntries } @kotlin.Metadata public synthetic final class test/Test$WhenMappings { @@ -19,4 +20,4 @@ public final class test/Test { public synthetic inner class test/Test$WhenMappings public method (): void public final @org.jetbrains.annotations.NotNull method visibleWhenMapping(@org.jetbrains.annotations.NotNull p0: test.E): java.lang.String -} \ No newline at end of file +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum_ir.txt index 6338a5a0396..0f62221d06a 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum_ir.txt @@ -11,6 +11,10 @@ public enum E { public final void b() { } + public static kotlin.enums.EnumEntries getEntries() { + return null; + } + @kotlin.Metadata() public static final class NestedClass { @@ -45,6 +49,10 @@ public enum E2 { } public abstract void a(); + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// @@ -64,6 +72,10 @@ public enum E3 { public final java.lang.String getA() { return null; } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// @@ -97,4 +109,8 @@ public enum E4 { public final boolean getD() { return false; } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt index 06cb8b31a1f..f696f3c8b9c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt @@ -59,6 +59,10 @@ public enum Enum { public final int getX() { return 0; } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt index 6dbd59a21aa..4a34475781b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations_ir.txt @@ -49,6 +49,10 @@ public enum Colors { Colors() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// @@ -62,6 +66,10 @@ public enum Enum1 { Enum1() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt index 7cb7d596334..eb94fe6a34e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved_ir.txt @@ -18,6 +18,10 @@ public enum EnumError { @org.jetbrains.annotations.NotNull() public abstract java.lang.String doIt(); + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt index a89fe1c42a6..201c602e376 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt @@ -18,6 +18,10 @@ public enum EnumError { @org.jetbrains.annotations.NotNull() public abstract java.lang.String doIt(); + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt index 04726724644..ca3dccf1547 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff_ir.txt @@ -5,6 +5,10 @@ public enum Em { Em() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt index d25e13473bb..378d5cb6963 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn_ir.txt @@ -5,6 +5,10 @@ public enum Em { Em() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumImports_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumImports_ir.txt new file mode 100644 index 00000000000..05af741b83b --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumImports_ir.txt @@ -0,0 +1,17 @@ +package kapt; + +import kotlin.annotation.Repeatable; + +@kotlin.Metadata() +public enum Options { + /*public static final*/ A /* = new Options() */, + /*public static final*/ B /* = new Options() */, + /*public static final*/ C /* = new Options() */; + + Options() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt index 87623e6ff8d..bb1e8a288bf 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion_ir.txt @@ -22,6 +22,10 @@ public final class Test { Example() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } } } @@ -53,6 +57,10 @@ public final class Test2 { Example() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } } } @@ -84,6 +92,10 @@ public final class Test3 { Example() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } } } @@ -162,6 +174,10 @@ public final class Test5 { Example() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums_ir.txt new file mode 100644 index 00000000000..1b00a526528 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums_ir.txt @@ -0,0 +1,97 @@ +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface Anno1 { + + public abstract java.lang.String value(); +} + +//////////////////// + + +@kotlin.Metadata() +public enum Enum1 { + /*public static final*/ BLACK /* = new Enum1() */, + /*public static final*/ WHITE /* = new Enum1() */; + + Enum1() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} + +//////////////////// + + +@kotlin.Metadata() +public enum Enum2 { + /*public static final*/ RED /* = new Enum2() */, + /*public static final*/ WHITE /* = new Enum2() */; + @org.jetbrains.annotations.NotNull() + private final java.lang.String col = null; + private final int col2 = 0; + + Enum2(@Anno1(value = "first") + java.lang.String col, @Anno1(value = "second") + int col2) { + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getCol() { + return null; + } + + public final int getCol2() { + return 0; + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String color() { + return null; + } + + private final void privateEnumFun() { + } + + public final void publicEnumFun() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} + +//////////////////// + + +@kotlin.Metadata() +public abstract interface I { + + @kotlin.Metadata() + public static enum Nested { + /*public static final*/ WHITE /* = new Nested() */; + + Nested() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } + } +} + +//////////////////// + + +@kotlin.Metadata() +public enum Nested1 { + /*public static final*/ WHITE /* = new Nested1() */; + + Nested1() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple_ir.txt new file mode 100644 index 00000000000..43a90f00369 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple_ir.txt @@ -0,0 +1,52 @@ +@kotlin.Metadata() +public abstract class BaseClass { + + public BaseClass(@org.jetbrains.annotations.NotNull() + Context context, int num, boolean bool) { + super(); + } + + @org.jetbrains.annotations.NotNull() + public abstract Result doJob(); +} + +//////////////////// + + +@kotlin.Metadata() +public abstract interface Context { +} + +//////////////////// + + +@kotlin.Metadata() +public final class Inheritor extends BaseClass { + + public Inheritor(@org.jetbrains.annotations.NotNull() + Context context) { + super(null, 0, false); + } + + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public Result doJob() { + return null; + } +} + +//////////////////// + + +@kotlin.Metadata() +public enum Result { + /*public static final*/ SUCCESS /* = new Result() */, + /*public static final*/ ERROR /* = new Result() */; + + Result() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName_ir.txt new file mode 100644 index 00000000000..9a12ed5cf8e --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName_ir.txt @@ -0,0 +1,22 @@ +@Anno(color = Color.InvalidFieldName) +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface Anno { + + public abstract Color color(); +} + +//////////////////// + + +@kotlin.Metadata() +public enum Color { + /*public static final*/ BLACK /* = new Color() */; + + Color() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses_ir.txt index 3eb5d7e1bed..402c4b63b14 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses_ir.txt @@ -148,6 +148,10 @@ public final class Test { NestedEnum() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } @kotlin.Metadata() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations_ir.txt new file mode 100644 index 00000000000..5095aa27f70 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations_ir.txt @@ -0,0 +1,231 @@ +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoArray { + + public abstract int x(); + + public abstract java.lang.String[] a(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoBoolean { + + public abstract int x(); + + public abstract boolean bool(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoChar { + + public abstract int x(); + + public abstract char chr(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoClass { + + public abstract int x(); + + public abstract java.lang.Class c(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoDouble { + + public abstract int x(); + + public abstract double dbl(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoEnum { + + public abstract int x(); + + public abstract Color c(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoFloat { + + public abstract int x(); + + public abstract float flt(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoInt { + + public abstract int x(); + + public abstract int i(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoIntArray { + + public abstract int x(); + + public abstract int[] b(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoLong { + + public abstract int x(); + + public abstract long l(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoLongArray { + + public abstract int x(); + + public abstract long[] b(); +} + +//////////////////// + + +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@kotlin.Metadata() +public abstract @interface AnnoString { + + public abstract int x(); + + public abstract java.lang.String s(); +} + +//////////////////// + + +@kotlin.Metadata() +public enum Color { + /*public static final*/ BLACK /* = new Color() */; + + Color() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} + +//////////////////// + + +@kotlin.Metadata() +public final class Test { + @org.jetbrains.annotations.NotNull() + private final java.lang.String value = ""; + + public Test() { + super(); + } + + @org.jetbrains.annotations.NotNull() + public final java.lang.String getValue() { + return null; + } + + @lib.Anno(value = "1") + @lib.Anno(value = "2", construct = {"A", "B"}) + @lib.Anno(value = "3", construct = {"C"}) + @java.lang.Deprecated() + public static void getValue$annotations() { + } +} + +//////////////////// + + +@AnnoChar(x = lib.R.id.textView, chr = 'c') +@AnnoBoolean(x = lib.R.id.textView, bool = false) +@AnnoInt(x = lib.R.id.textView, i = 5) +@AnnoFloat(x = lib.R.id.textView, flt = 1.0F) +@AnnoDouble(x = lib.R.id.textView, dbl = 4.0) +@AnnoString(x = lib.R.id.textView, s = "AAA") +@AnnoIntArray(x = lib.R.id.textView, b = {1, 2, 3}) +@AnnoLongArray(x = lib.R.id.textView, b = {1L, 3L}) +@AnnoArray(x = lib.R.id.textView, a = {"A", "B"}) +@AnnoClass(x = lib.R.id.textView, c = Color.class) +@kotlin.Metadata() +public final class Test2 { + + public Test2() { + super(); + } +} + +//////////////////// + +package lib; + +public @interface Anno { + + String[] construct() default {}; + + String value(); +} + +//////////////////// + +package lib; + +public class R { + + public R() { + super(); + } + + public static class id { + + public id() { + super(); + } + public static final int textView = 100; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt index e7a03836911..98c2216c501 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers_ir.txt @@ -23,6 +23,10 @@ public enum StrangeEnum { public final java.lang.String getSize() { return null; } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } //////////////////// diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata_ir.txt new file mode 100644 index 00000000000..61364cde2dc --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata_ir.txt @@ -0,0 +1,48 @@ +public abstract class BaseClass { + + public BaseClass(@org.jetbrains.annotations.NotNull() + Context context, int num, boolean bool) { + super(); + } + + @org.jetbrains.annotations.NotNull() + public abstract Result doJob(); +} + +//////////////////// + + +public abstract interface Context { +} + +//////////////////// + + +public final class Inheritor extends BaseClass { + + public Inheritor(@org.jetbrains.annotations.NotNull() + Context context) { + super(null, 0, false); + } + + @java.lang.Override() + @org.jetbrains.annotations.NotNull() + public Result doJob() { + return null; + } +} + +//////////////////// + + +public enum Result { + /*public static final*/ SUCCESS /* = new Result() */, + /*public static final*/ ERROR /* = new Result() */; + + Result() { + } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt index 59b0215b768..7274716a3c9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers_ir.txt @@ -221,4 +221,8 @@ public enum State { State() { } + + public static kotlin.enums.EnumEntries getEntries() { + return null; + } } diff --git a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.fir.txt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.fir.txt new file mode 100644 index 00000000000..0d045358bf5 --- /dev/null +++ b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.fir.txt @@ -0,0 +1,48 @@ +@NoArg +@kotlin.Metadata +public final enum class Colors { + // source: 'annoOnNotClass.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries + private synthetic final static field $VALUES: Colors[] + public final enum static field RED: Colors + public final enum static field WHITE: Colors + private synthetic final static method $entries(): Colors[] + private synthetic final static method $values(): Colors[] + static method (): void + private method (p0: java.lang.String, p1: int): void + public static method getEntries(): kotlin.enums.EnumEntries + public static method valueOf(p0: java.lang.String): Colors + public static method values(): Colors[] +} + +@NoArg +@kotlin.Metadata +public interface Intf { + // source: 'annoOnNotClass.kt' +} + +@kotlin.Metadata +public final class MyClass { + // source: 'annoOnNotClass.kt' + private @NoArg @org.jetbrains.annotations.NotNull field abc: java.lang.String + public method (p0: int): void + public final @NoArg @org.jetbrains.annotations.NotNull method getAbc(): java.lang.String + public final @NoArg method setAbc(@org.jetbrains.annotations.NotNull p0: java.lang.String): void + public final @NoArg method someFun(): void +} + +@NoArg +@java.lang.annotation.Retention(value=RUNTIME) +@kotlin.Metadata +public annotation class NoArg { + // source: 'annoOnNotClass.kt' +} + +@NoArg +@kotlin.Metadata +public final class Obj { + // source: 'annoOnNotClass.kt' + public final static @org.jetbrains.annotations.NotNull field INSTANCE: Obj + static method (): void + private method (): void +} diff --git a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt index 159876d603a..650aec46d48 100644 --- a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt +++ b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.ir.txt @@ -2,9 +2,11 @@ @kotlin.Metadata public final enum class Colors { // source: 'annoOnNotClass.kt' + private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries private synthetic final static field $VALUES: Colors[] public final enum static field RED: Colors public final enum static field WHITE: Colors + private synthetic final static method $entries(): Colors[] private synthetic final static method $values(): Colors[] static method (): void private method (p0: java.lang.String, p1: int): void diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt index 970e05b4623..6dd3d07a871 100644 --- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt +++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt @@ -207,7 +207,10 @@ class ScriptingCompilerPluginTest : TestCase() { } val cp = (runtimeClasspath + scriptingClasspath + defsOut).joinToString(File.pathSeparator) - val exitCode = K2JVMCompiler().exec(System.err, "-cp", cp, *(scriptFiles.toTypedArray()), "-d", scriptsOut2.canonicalPath) + val exitCode = K2JVMCompiler().exec( + System.err, + "-cp", cp, *(scriptFiles.toTypedArray()), "-d", scriptsOut2.canonicalPath, "-Xallow-any-scripts-in-source-roots" + ) Assert.assertEquals(ExitCode.OK, exitCode) } diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt index c83f38a787b..2560c57fb61 100644 --- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt +++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt @@ -258,7 +258,9 @@ class ScriptingWithCliCompilerTest { K2JVMCompiler(), arrayOf( "-P", "plugin:kotlin.scripting:disable-script-definitions-autoloading=true", - "-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-d", tmpdir.path, "-verbose", fileArg) + "-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-d", tmpdir.path, + "-Xallow-any-scripts-in-source-roots", "-verbose", fileArg + ) ) } Assert.assertEquals(0, ret.code) diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CollectScriptCompilationDependenciesTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CollectScriptCompilationDependenciesTest.kt index c51afdb92b6..2c8d5e367e3 100644 --- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CollectScriptCompilationDependenciesTest.kt +++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CollectScriptCompilationDependenciesTest.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots +import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.script.loadScriptingPlugin import org.jetbrains.kotlin.scripting.compiler.plugin.TestDisposable import org.jetbrains.kotlin.scripting.compiler.plugin.updateWithBaseCompilerArguments @@ -70,6 +71,7 @@ class CollectScriptCompilationDependenciesTest : TestCase() { ) addKotlinSourceRoot(File(testDataPath, scriptFile).path) + put(CommonConfigurationKeys.ALLOW_ANY_SCRIPTS_IN_SOURCE_ROOTS, true) loadScriptingPlugin(this) } diff --git a/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt b/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt index e17d596df9f..1dc94ee136b 100644 --- a/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt +++ b/prepare/compiler-client-embeddable/tests/kotlin/org/jetbrains/kotlin/compiler/client/CompilerClientIT.kt @@ -80,6 +80,7 @@ class CompilerClientIT { fun testSimpleScript() { val (out, code) = runCompiler( "-cp", compilationClasspath.joinToString(File.pathSeparator) { it.canonicalPath }, + "-Xallow-any-scripts-in-source-roots", File("testData/scripts/simpleHelloWorld.kts").canonicalPath) assertEquals(0, code, "compilation failed:\n" + out + "\n") }