diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java index a2e331ecaa3..2265ce0912a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java @@ -21488,18 +21488,6 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java index 0920ea54938..05c77158f67 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java @@ -21488,18 +21488,6 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index d29949196f7..c3f0a596217 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -21417,18 +21417,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java index 4827751c7ee..070261edaa7 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java @@ -21417,18 +21417,6 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index 18571faaa7a..c32920f9e17 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -21417,18 +21417,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.jvm_abi.txt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.jvm_abi.txt deleted file mode 100644 index b9804ebe5f2..00000000000 --- a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.jvm_abi.txt +++ /dev/null @@ -1,35 +0,0 @@ -MODULE main - CLASS B.class - K1 - getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge] - K2 - --- - K1 - getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge] - K2 - --- - K1 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge] - K2 - --- - K1 - remove(Ljava/lang/String;Ljava/lang/String;)Z [public, bridge] - K2 - --- - CLASS D.class - K1 - getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge] - K2 - --- - K1 - getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge] - K2 - --- - K1 - remove(Ljava/lang/Object;Ljava/lang/Object;)Z [public, final, bridge] - K2 - --- - K1 - remove(Ljava/lang/String;Ljava/lang/String;)Z [public, bridge] - K2 - --- diff --git a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt index ec8593c34ad..b7e3a4441b6 100644 --- a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt +++ b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt @@ -4,7 +4,6 @@ // JVM_TARGET: 1.8 // WITH_STDLIB // FULL_JDK -// JVM_ABI_K1_K2_DIFF: KT-57301 // There should be no DefaultImpls method for MutableMap.remove(K;V) interface A : MutableMap diff --git a/compiler/testData/codegen/box/collections/kt48945.jvm_abi.txt b/compiler/testData/codegen/box/collections/kt48945.jvm_abi.txt deleted file mode 100644 index 11267717795..00000000000 --- a/compiler/testData/codegen/box/collections/kt48945.jvm_abi.txt +++ /dev/null @@ -1,10 +0,0 @@ -MODULE main - CLASS Test.class - K1 - getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge] - K2 - --- - K1 - getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge] - K2 - --- diff --git a/compiler/testData/codegen/box/collections/kt48945.kt b/compiler/testData/codegen/box/collections/kt48945.kt index 70730fd13df..48f53118fdc 100644 --- a/compiler/testData/codegen/box/collections/kt48945.kt +++ b/compiler/testData/codegen/box/collections/kt48945.kt @@ -3,7 +3,6 @@ // IGNORE_BACKEND: ANDROID // ^ NSME: java.util.AbstractMap.remove // FULL_JDK -// JVM_ABI_K1_K2_DIFF: KT-65095 class Test : Map, java.util.AbstractMap() { override val entries: MutableSet> diff --git a/compiler/testData/codegen/box/collections/kt48945a.jvm_abi.txt b/compiler/testData/codegen/box/collections/kt48945a.jvm_abi.txt deleted file mode 100644 index 11267717795..00000000000 --- a/compiler/testData/codegen/box/collections/kt48945a.jvm_abi.txt +++ /dev/null @@ -1,10 +0,0 @@ -MODULE main - CLASS Test.class - K1 - getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge] - K2 - --- - K1 - getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge] - K2 - --- diff --git a/compiler/testData/codegen/box/collections/kt48945a.kt b/compiler/testData/codegen/box/collections/kt48945a.kt index 2824ccd3931..35ae3d40152 100644 --- a/compiler/testData/codegen/box/collections/kt48945a.kt +++ b/compiler/testData/codegen/box/collections/kt48945a.kt @@ -3,7 +3,6 @@ // IGNORE_BACKEND: ANDROID // ^ NSME: java.util.AbstractMap.remove // FULL_JDK -// JVM_ABI_K1_K2_DIFF: KT-65095 interface MSS : Map diff --git a/compiler/testData/codegen/box/collections/kt48945b.jvm_abi.txt b/compiler/testData/codegen/box/collections/kt48945b.jvm_abi.txt deleted file mode 100644 index 11267717795..00000000000 --- a/compiler/testData/codegen/box/collections/kt48945b.jvm_abi.txt +++ /dev/null @@ -1,10 +0,0 @@ -MODULE main - CLASS Test.class - K1 - getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge] - K2 - --- - K1 - getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge] - K2 - --- diff --git a/compiler/testData/codegen/box/collections/kt48945b.kt b/compiler/testData/codegen/box/collections/kt48945b.kt index 26780c50f69..8b47f5fbee7 100644 --- a/compiler/testData/codegen/box/collections/kt48945b.kt +++ b/compiler/testData/codegen/box/collections/kt48945b.kt @@ -3,7 +3,6 @@ // IGNORE_BACKEND: ANDROID // ^ NSME: java.util.AbstractMap.remove // FULL_JDK -// JVM_ABI_K1_K2_DIFF: KT-65095 // FILE: kt48945b.kt interface MSS : Map diff --git a/compiler/testData/codegen/box/collections/kt48945c.jvm_abi.txt b/compiler/testData/codegen/box/collections/kt48945c.jvm_abi.txt deleted file mode 100644 index 11267717795..00000000000 --- a/compiler/testData/codegen/box/collections/kt48945c.jvm_abi.txt +++ /dev/null @@ -1,10 +0,0 @@ -MODULE main - CLASS Test.class - K1 - getOrDefault(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String; [public, final, bridge] - K2 - --- - K1 - getOrDefault(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; [public, bridge] - K2 - --- diff --git a/compiler/testData/codegen/box/collections/kt48945c.kt b/compiler/testData/codegen/box/collections/kt48945c.kt index d9c25d4f9e0..5d0fd3cd9a2 100644 --- a/compiler/testData/codegen/box/collections/kt48945c.kt +++ b/compiler/testData/codegen/box/collections/kt48945c.kt @@ -3,7 +3,6 @@ // IGNORE_BACKEND: ANDROID // ^ NSME: java.util.AbstractMap.remove // FULL_JDK -// JVM_ABI_K1_K2_DIFF: KT-65095 // FILE: kt48945b.kt interface MSS : Map diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt index 280446679be..3141e82229e 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt @@ -1,7 +1,8 @@ // IGNORE_BACKEND_K2: JS_IR // IGNORE_BACKEND: NATIVE -// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION -// Reason: KT-42020 + +// IGNORE_BACKEND_K2: JVM_IR +// FIR status: KT-65504 IrFakeOverrideBuilder: incorrect runtime behavior in case a substitution fake override clashes with another fake override // MODULE: lib // FILE: a.kt diff --git a/compiler/testData/codegen/box/fir/CustomHashSetSize.kt b/compiler/testData/codegen/box/fir/CustomHashSetSize.kt index c09659171c2..afb7aa7cc72 100644 --- a/compiler/testData/codegen/box/fir/CustomHashSetSize.kt +++ b/compiler/testData/codegen/box/fir/CustomHashSetSize.kt @@ -1,5 +1,5 @@ // TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K2: JVM_IR +// IGNORE_CODEGEN_WITH_FIR2IR_FAKE_OVERRIDE_GENERATION: JVM_IR // ISSUE: KT-61941 // WITH_STDLIB diff --git a/compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt b/compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt deleted file mode 100644 index 7c94da078c0..00000000000 --- a/compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt +++ /dev/null @@ -1,21 +0,0 @@ -// TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K1: JVM_IR -// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION -// Both K1 and K2 with IR f/o generator report ACCIDENTAL_OVERRIDE on B.foo (see also KT-60283) -// ISSUE: KT-59380 - -// FILE: A.java - -public class A { - public static String foo() { - return "FAIL"; - } -} - -// FILE: box.kt - -class B : A() { - fun foo() = "OK" -} - -fun box() = B().foo() diff --git a/compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt b/compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt deleted file mode 100644 index a9e445602ed..00000000000 --- a/compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt +++ /dev/null @@ -1,53 +0,0 @@ -// TARGET_BACKEND: JVM_IR -// IGNORE_BACKEND_K1: JVM_IR -// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION -// Both K1 and K2 with IR f/o generator report ACCIDENTAL_OVERRIDE on B.foo (see also KT-60283) -// ISSUE: KT-59830 - -// FILE: A.java - -public class A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.kt - -open class B : A() { -} - -// FILE: C.java - -public class C extends B { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : C() { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} - -fun box(): String { - A.foo() - A.baz("") - C.bar(0) - K.foo() - K.bar(0) - val k = K() - k.foo() - k.foo(0.0) - k.bar(0) - k.bar("") - k.baz(0) - return "OK" -} diff --git a/compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.jvm_abi.txt b/compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.jvm_abi.txt deleted file mode 100644 index c346715b548..00000000000 --- a/compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.jvm_abi.txt +++ /dev/null @@ -1,10 +0,0 @@ -MODULE main - CLASS MyFinalClassI.class - K1 - --- - K2 - test(I)Ljava/lang/Integer; [public] - K1 - --- - K2 - testWithDefault(Ljava/lang/Integer;)Ljava/lang/Integer; [public] diff --git a/compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.kt b/compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.kt index 7ddfa639750..b3639287128 100644 --- a/compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.kt +++ b/compiler/testData/codegen/box/inference/overrideGenericDefaultMethod.kt @@ -1,5 +1,3 @@ -// JVM_ABI_K1_K2_DIFF: KT-62781 - // MODULE: InterfaceModule // FILE: MyInterface.kt interface MyInterface { diff --git a/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt b/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt index 3738f62137c..9a9a105eab2 100644 --- a/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt +++ b/compiler/testData/codegen/box/ir/clashingFakeOverrideSignatures.kt @@ -1,6 +1,6 @@ // TARGET_BACKEND: JVM -// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION -// Reason: KT-42020 +// IGNORE_BACKEND_K2: JVM_IR +// FIR status: KT-65504 IrFakeOverrideBuilder: incorrect runtime behavior in case a substitution fake override clashes with another fake override open class Base { fun foo(x: T) = "x:$x" diff --git a/compiler/testData/codegen/box/jvm8/kt14243_2.jvm_abi.txt b/compiler/testData/codegen/box/jvm8/kt14243_2.jvm_abi.txt deleted file mode 100644 index f5ec8078363..00000000000 --- a/compiler/testData/codegen/box/jvm8/kt14243_2.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS ZImpl2.class - K1 - --- - K2 - test(Ljava/lang/String;)Ljava/lang/String; [public] diff --git a/compiler/testData/codegen/box/jvm8/kt14243_2.kt b/compiler/testData/codegen/box/jvm8/kt14243_2.kt index 3c84d97c01d..431e181fd42 100644 --- a/compiler/testData/codegen/box/jvm8/kt14243_2.kt +++ b/compiler/testData/codegen/box/jvm8/kt14243_2.kt @@ -1,5 +1,3 @@ -// JVM_ABI_K1_K2_DIFF: KT-62781 - // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 @@ -22,4 +20,4 @@ class ZImpl3 : ZImpl2() { fun box(): String { return ZImpl3().test("OK") -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/box/jvm8/kt33054.jvm_abi.txt b/compiler/testData/codegen/box/jvm8/kt33054.jvm_abi.txt deleted file mode 100644 index c6dcef1c1cb..00000000000 --- a/compiler/testData/codegen/box/jvm8/kt33054.jvm_abi.txt +++ /dev/null @@ -1,45 +0,0 @@ -MODULE main - CLASS Kt33054Kt.class - Annotation: class.invisibleAnnotations - K1 - @Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP - kt33054.kt - Kotlin - *S Kotlin - *F - + 1 kt33054.kt - Kt33054Kt - + 2 kt33054.kt - A - *L - 1#1,20:1 - 6#2,4:21 - *S KotlinDebug - *F - + 1 kt33054.kt - Kt33054Kt - *L - 19#1:21,4 - *E - } ) - K2 - @Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP - kt33054.kt - Kotlin - *S Kotlin - *F - + 1 kt33054.kt - Kt33054Kt - + 2 kt33054.kt - A - *L - 1#1,20:1 - 6#2:21 - *S KotlinDebug - *F - + 1 kt33054.kt - Kt33054Kt - *L - 19#1:21 - *E - } ) diff --git a/compiler/testData/codegen/box/jvm8/kt33054.kt b/compiler/testData/codegen/box/jvm8/kt33054.kt index 23ed7ebf965..c49ac5dc9c0 100644 --- a/compiler/testData/codegen/box/jvm8/kt33054.kt +++ b/compiler/testData/codegen/box/jvm8/kt33054.kt @@ -1,6 +1,5 @@ // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 -// JVM_ABI_K1_K2_DIFF: KT-62464 open class A(val x: String) { inline fun f() = if (this is C) this else A("O") diff --git a/compiler/testData/codegen/box/super/kt14243_2.jvm_abi.txt b/compiler/testData/codegen/box/super/kt14243_2.jvm_abi.txt deleted file mode 100644 index f5ec8078363..00000000000 --- a/compiler/testData/codegen/box/super/kt14243_2.jvm_abi.txt +++ /dev/null @@ -1,6 +0,0 @@ -MODULE main - CLASS ZImpl2.class - K1 - --- - K2 - test(Ljava/lang/String;)Ljava/lang/String; [public] diff --git a/compiler/testData/codegen/box/super/kt14243_2.kt b/compiler/testData/codegen/box/super/kt14243_2.kt index 0e03d38a5eb..5d8e103dbc6 100644 --- a/compiler/testData/codegen/box/super/kt14243_2.kt +++ b/compiler/testData/codegen/box/super/kt14243_2.kt @@ -1,5 +1,3 @@ -// JVM_ABI_K1_K2_DIFF: KT-62781 - interface Z { fun test(p: T): T { return p @@ -19,4 +17,4 @@ class ZImpl3 : ZImpl2() { fun box(): String { return ZImpl3().test("OK") -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/boxInline/property/fromObject.jvm_abi.txt b/compiler/testData/codegen/boxInline/property/fromObject.jvm_abi.txt deleted file mode 100644 index 86372cde9fd..00000000000 --- a/compiler/testData/codegen/boxInline/property/fromObject.jvm_abi.txt +++ /dev/null @@ -1,34 +0,0 @@ -MODULE main - CLASS _2Kt.class - Annotation: class.invisibleAnnotations - K1 - @Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP - 2.kt - Kotlin - *S Kotlin - *F - + 1 2.kt - _2Kt - + 2 1.kt - test/A - + 3 fake.kt - kotlin/jvm/internal/FakeKt - *L - 1#1,29:1 - 12#2:30 - 13#2:32 - 10#2:33 - 1#3:31 - *S KotlinDebug - *F - + 1 2.kt - _2Kt - *L - 25#1:30 - 25#1:32 - 27#1:33 - 25#1:31 - *E - } ) - K2 - --- diff --git a/compiler/testData/codegen/boxInline/property/fromObject.kt b/compiler/testData/codegen/boxInline/property/fromObject.kt index 48142416b29..5c28222b796 100644 --- a/compiler/testData/codegen/boxInline/property/fromObject.kt +++ b/compiler/testData/codegen/boxInline/property/fromObject.kt @@ -1,6 +1,4 @@ // WITH_STDLIB -// JVM_ABI_K1_K2_DIFF: KT-66000 - // FILE: 1.kt package test diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt index e0fad053166..812b2386e94 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt @@ -56,7 +56,7 @@ FILE fqName: fileName:/recordWithCompanion.kt id: GET_VAR 'id: kotlin.String declared in .Tag.copy' type=kotlin.String origin=null FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.Tag, other:kotlin.Any?) returnType:kotlin.Boolean [operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any + public abstract fun equals (p0: @[EnhancedNullability] kotlin.Any?): kotlin.Boolean declared in java.lang.Record $this: VALUE_PARAMETER name: type:.Tag VALUE_PARAMETER name:other index:0 type:kotlin.Any? BLOCK_BODY @@ -90,7 +90,7 @@ FILE fqName: fileName:/recordWithCompanion.kt CONST Boolean type=kotlin.Boolean value=true FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.Tag) returnType:kotlin.Int overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any + public abstract fun hashCode (): kotlin.Int declared in java.lang.Record $this: VALUE_PARAMETER name: type:.Tag BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in .Tag' @@ -99,7 +99,7 @@ FILE fqName: fileName:/recordWithCompanion.kt receiver: GET_VAR ': .Tag declared in .Tag.hashCode' type=.Tag origin=null FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.Tag) returnType:kotlin.String overridden: - public open fun toString (): kotlin.String declared in kotlin.Any + public abstract fun toString (): @[EnhancedNullability] kotlin.String declared in java.lang.Record $this: VALUE_PARAMETER name: type:.Tag BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Tag' diff --git a/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.kt b/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.kt index 56eadfe0d34..d88eaee8305 100644 --- a/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.kt +++ b/compiler/testData/codegen/bytecodeListing/specialBridges/kt48945.kt @@ -1,9 +1,6 @@ // TARGET_BACKEND: JVM // FULL_JDK -// IGNORE_BACKEND_K2: JVM_IR -// FIR status: KT-57301 K2: `getOrDefault` and bridges are not generated for certain Map subclasses - // FILE: kt48945.kt interface MSS : Map interface GM : Map diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.fir.kt index 447dc735a13..97b56bae863 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.fir.kt @@ -1,3 +1,5 @@ +// FIR status: KT-65249 K2: False positive modality is different for native compilation + // WITH_STDLIB // MODULE: m1-common // FILE: common.kt @@ -8,10 +10,10 @@ expect open class Base() { open class Transitive : Base() -expect open class Foo : Transitive { +expect open class Foo : Transitive { fun existingMethod() val existingParam: Int -} +} // MODULE: m2-jvm()()(m1-common) // FILE: jvm.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.kt index 46ab2ed31b6..15c74a9e0c9 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.kt @@ -1,3 +1,5 @@ +// FIR status: KT-65249 K2: False positive modality is different for native compilation + // WITH_STDLIB // MODULE: m1-common // FILE: common.kt diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.ll.kt new file mode 100644 index 00000000000..c2e71e0b524 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/supertypeIsExpectActual_covariantOverrideOfInjectedFromSuper_transitiveSubstitutionFakeOverride.ll.kt @@ -0,0 +1,31 @@ +// FIR status: KT-65249 K2: False positive modality is different for native compilation + +// WITH_STDLIB +// MODULE: m1-common +// FILE: common.kt + +expect open class Base() { + fun existingMethodInBase(param: T) +} + +open class Transitive : Base() + +expect open class Foo : Transitive { + fun existingMethod() + val existingParam: Int +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt + +actual open class Base { + actual fun existingMethodInBase(param: T) {} + open fun injected(param: T): Any = "" +} + +actual open class Foo : Transitive() { + actual fun existingMethod() {} + actual val existingParam: Int = 904 + + override fun injected(param: String): String = "" // covariant override +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModule.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModule.fir.kt index a9cb303da4c..d0f8ee31068 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModule.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModule.fir.kt @@ -1,7 +1,7 @@ // MODULE: m1-common // FILE: common.kt -expect class A +expect class A actual class A // MODULE: m1-jvm()()(m1-common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModule.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModule.ll.kt new file mode 100644 index 00000000000..a9cb303da4c --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModule.ll.kt @@ -0,0 +1,11 @@ +// MODULE: m1-common +// FILE: common.kt + +expect class A +actual class A + +// MODULE: m1-jvm()()(m1-common) +// FILE: jvm.kt + +expect class B +actual class B diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModuleDifferentFiles.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModuleDifferentFiles.fir.kt index 368aad02050..a5482c47db8 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModuleDifferentFiles.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/expectActualInTheSameModuleDifferentFiles.fir.kt @@ -1,7 +1,7 @@ // MODULE: m1-common // FILE: common.kt -expect class A +expect class A // FILE: common2.kt actual class A diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizeSubtypeBeforeSupertype.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizeSubtypeBeforeSupertype.fir.kt index 5fd59e1b4c2..6cffeca52dd 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizeSubtypeBeforeSupertype.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizeSubtypeBeforeSupertype.fir.kt @@ -1,7 +1,7 @@ // MODULE: common // TARGET_PLATFORM: Common -expect class A() : B -expect class C() : B +expect class A() : B +expect class C() : B expect open class B() // MODULE: intermediate()()(common) diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizedInPlatformSession.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizedInPlatformSession.fir.kt index fc057d41f45..4b34037a882 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizedInPlatformSession.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/actualizedInPlatformSession.fir.kt @@ -1,8 +1,8 @@ // MODULE: common // TARGET_PLATFORM: Common -expect class Foo() { - fun foo() -} +expect class Foo() { + fun foo() +} // MODULE: intermediate()()(common) // TARGET_PLATFORM: Common diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt index 4a024622368..8bf487f8e46 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.fir.kt @@ -1,12 +1,12 @@ // MODULE: common // TARGET_PLATFORM: Common -expect class CommonClass { +expect class CommonClass { fun memberFun() val memberProp: Int class Nested inner class Inner -} +} actual class CommonClass { actual fun memberFun() {} actual val memberProp: Int = 42 @@ -14,10 +14,10 @@ actual class Comm actual inner class Inner } -expect fun commonFun() +expect fun commonFun() actual fun commonFun() {} -expect val commonProperty: String +expect val commonProperty: String actual val commonProperty: String get() = "hello" diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt new file mode 100644 index 00000000000..4a024622368 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModule.ll.kt @@ -0,0 +1,67 @@ +// MODULE: common +// TARGET_PLATFORM: Common + +expect class CommonClass { + fun memberFun() + val memberProp: Int + class Nested + inner class Inner +} +actual class CommonClass { + actual fun memberFun() {} + actual val memberProp: Int = 42 + actual class Nested + actual inner class Inner +} + +expect fun commonFun() +actual fun commonFun() {} + +expect val commonProperty: String +actual val commonProperty: String + get() = "hello" + +// MODULE: intermediate()()(common) +// TARGET_PLATFORM: Common + +expect class IntermediateClass { + fun memberFun() + val memberProp: Int + class Nested + inner class Inner +} +actual class IntermediateClass { + actual fun memberFun() {} + actual val memberProp: Int = 42 + actual class Nested + actual inner class Inner +} + +expect fun intermediateFun() +actual fun intermediateFun() {} + +expect val intermediateProperty: String +actual val intermediateProperty: String + get() = "hello" + +// MODULE: main()()(intermediate) + +expect class PlatformClass { + fun memberFun() + val memberProp: Int + class Nested + inner class Inner +} +actual class PlatformClass { + actual fun memberFun() {} + actual val memberProp: Int = 42 + actual class Nested + actual inner class Inner +} + +expect fun platformFun() +actual fun platformFun() {} + +expect val platformProperty: String +actual val platformProperty: String + get() = "hello" diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt index d788fc5faf5..70bf0389124 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.fir.kt @@ -4,7 +4,7 @@ expect fun parameterCount() fun parameterCount(p: String) {} -expect fun parameterCount2() +expect fun parameterCount2() actual fun parameterCount2(p: String) {} expect fun callableKind(): Int @@ -13,9 +13,9 @@ val callableKind: Int = 1 expect fun typeParameterCount() fun typeParameterCount() {} -expect enum class EnumEntries { +expect enum class EnumEntries { ONE, TWO; -} +} actual enum class EnumEntries { ONE; } diff --git a/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt new file mode 100644 index 00000000000..d788fc5faf5 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/hmpp/multiplatformCompositeAnalysis/expectAndActualInTheSameModuleIncompatibilities.ll.kt @@ -0,0 +1,31 @@ +// MODULE: common +// TARGET_PLATFORM: Common + +expect fun parameterCount() +fun parameterCount(p: String) {} + +expect fun parameterCount2() +actual fun parameterCount2(p: String) {} + +expect fun callableKind(): Int +val callableKind: Int = 1 + +expect fun typeParameterCount() +fun typeParameterCount() {} + +expect enum class EnumEntries { + ONE, TWO; +} +actual enum class EnumEntries { + ONE; +} + +expect fun vararg(bar: Int) +fun vararg(vararg bar: Int) = Unit + +// MODULE: main()()(common) + +actual fun parameterCount() {} +actual fun typeParameterCount() {} +actual fun callableKind(): Int = 1 +actual fun vararg(bar: Int) = Unit diff --git a/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.fir.kt index 51f19600c50..aae466d20b5 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.fir.kt @@ -10,8 +10,8 @@ expect annotation class A() fun useInSignature(a: A) = a.toString() -@OptionalExpectation -expect class NotAnAnnotationClass +@OptionalExpectation +expect class NotAnAnnotationClass @OptionalExpectation annotation class NotAnExpectedClass diff --git a/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.ll.kt b/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.ll.kt deleted file mode 100644 index aae466d20b5..00000000000 --- a/compiler/testData/diagnostics/tests/multiplatform/optionalExpectationDiagnostics.ll.kt +++ /dev/null @@ -1,44 +0,0 @@ -// WITH_STDLIB -// !OPT_IN: kotlin.ExperimentalMultiplatform - -// MODULE: common -// TARGET_PLATFORM: Common -// FILE: common.kt - -@OptionalExpectation -expect annotation class A() - -fun useInSignature(a: A) = a.toString() - -@OptionalExpectation -expect class NotAnAnnotationClass - -@OptionalExpectation -annotation class NotAnExpectedClass - -annotation class InOtherAnnotation(val a: A) - -@InOtherAnnotation(A()) -fun useInOtherAnnotation() {} - -expect class C { - @OptionalExpectation - annotation class Nested -} - -// MODULE: platform()()(common) -// FILE: platform.kt - -@A -class D - -fun useInReturnType(): A? = null - -annotation class AnotherAnnotation(val a: A) - -@AnotherAnnotation(A()) -fun useInAnotherAnnotation() {} - -actual class C { - actual annotation class Nested -} diff --git a/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt index a9f6bdb8f51..fd62c17dc3d 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/scopes/mixedFunctionalTypesInSupertypes.fir.kt @@ -13,7 +13,7 @@ expect interface I2 { suspend fun invoke(): R } -expect interface ExpectInterface : I1, I2 +expect interface ExpectInterface : I1, I2 interface CommonInterface : I1, I2 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.fir.kt deleted file mode 100644 index 95288fb339f..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.fir.kt +++ /dev/null @@ -1,34 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.kt - -open class B : A() { -} - -// FILE: C.java - -public class C extends B { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : C() { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt index f92e1f2ad39..43ada013dcf 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt @@ -1,5 +1,5 @@ +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER - // FILE: A.java public class A { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.fir.kt deleted file mode 100644 index 8928cc0b7d2..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.fir.kt +++ /dev/null @@ -1,22 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static int a = 1; - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: K.kt - -open class K : A() { - val a = 1 - fun foo() {} - fun foo(i: Int) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt index 95b2e1c5dc3..acf9fdf4a78 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt @@ -1,5 +1,5 @@ +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER - // FILE: A.java public class A { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.fir.kt deleted file mode 100644 index 3a0c83a9915..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.fir.kt +++ /dev/null @@ -1,29 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// FILE: A.java - -public class A { - public static void foo() {} - public static void baz(String s) {} -} - -// FILE: B.java - -public class B extends A { - public static void bar(int i) {} -} - -// FILE: K.kt - -open class K : B() { - fun foo() {} - fun foo(a: Any) {} - fun bar(i: Int) {} - fun bar(i: String) {} - fun baz(i: Int) {} - - companion object { - fun foo() {} - fun bar(i: Int) {} - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt index 1e62600651e..70d53c8c523 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt @@ -1,5 +1,5 @@ +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER - // FILE: A.java public class A { diff --git a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.kt b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.kt index e03dfe85954..239dec824a0 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.kt +++ b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.kt @@ -3,10 +3,6 @@ // SKIP_KLIB_TEST // IGNORE_BACKEND_K1: JS_IR -// KT-64271 -// IGNORE_BACKEND_K2: JVM_IR - - sealed class A : CharSequence { data class B(val c: CharSequence) : A(), CharSequence by c } diff --git a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.ir.txt b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.ir.txt deleted file mode 100644 index d1a3353b749..00000000000 --- a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -FILE fqName: fileName:/fakeOverridesForJavaStaticMembers.kt - CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[a.Base] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test - CONSTRUCTOR visibility:public <> () returnType:.Test [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in a.Base' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[a.Base]' - 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 declared in a.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 declared in a.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 declared in a.Base - $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.kt.txt b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.kt.txt deleted file mode 100644 index f4f44ae84e1..00000000000 --- a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.fir.kt.txt +++ /dev/null @@ -1,8 +0,0 @@ -class Test : Base { - constructor() /* primary */ { - super/*Base*/() - /* () */ - - } - -} diff --git a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt index fde5fa2c5d8..4efa05e015a 100644 --- a/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt +++ b/compiler/testData/ir/irText/classes/fakeOverridesForJavaStaticMembers.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // TARGET_BACKEND: JVM // FILE: fakeOverridesForJavaStaticMembers.kt import a.Base @@ -12,4 +13,4 @@ public class Base { protected static void protectedStaticMethod() {} static void packagePrivateStaticMethod() {} private static void privateStaticMethod() {} -} \ No newline at end of file +} diff --git a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt index 01c81ff332e..ee09ca49068 100644 --- a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt +++ b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.kt @@ -1,7 +1,7 @@ // FIR_IDENTICAL // KT-64271 // IGNORE_BACKEND_K1: JS_IR, JS_IR_ES6 -// IGNORE_BACKEND_K2: JVM_IR, JS_IR, JS_IR_ES6 +// IGNORE_BACKEND_K2: JS_IR, JS_IR_ES6 // ^ Set has js specific methods inline class IT(val x: Int) diff --git a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt index feabf957a82..0159376a610 100644 --- a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt @@ -37,7 +37,7 @@ FILE fqName: fileName:/dataClassWithJvmRecord.kt name: GET_VAR 'name: kotlin.String declared in .MyRec.copy' type=kotlin.String origin=null FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.MyRec, other:kotlin.Any?) returnType:kotlin.Boolean [operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any + public abstract fun equals (p0: @[EnhancedNullability] kotlin.Any?): kotlin.Boolean declared in java.lang.Record $this: VALUE_PARAMETER name: type:.MyRec VALUE_PARAMETER name:other index:0 type:kotlin.Any? BLOCK_BODY @@ -71,7 +71,7 @@ FILE fqName: fileName:/dataClassWithJvmRecord.kt CONST Boolean type=kotlin.Boolean value=true FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.MyRec) returnType:kotlin.Int overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any + public abstract fun hashCode (): kotlin.Int declared in java.lang.Record $this: VALUE_PARAMETER name: type:.MyRec BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in .MyRec' @@ -80,7 +80,7 @@ FILE fqName: fileName:/dataClassWithJvmRecord.kt receiver: GET_VAR ': .MyRec declared in .MyRec.hashCode' type=.MyRec origin=null FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.MyRec) returnType:kotlin.String overridden: - public open fun toString (): kotlin.String declared in kotlin.Any + public abstract fun toString (): @[EnhancedNullability] kotlin.String declared in java.lang.Record $this: VALUE_PARAMETER name: type:.MyRec BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .MyRec' diff --git a/compiler/testData/ir/irText/expressions/kt30020.fir.ir.txt b/compiler/testData/ir/irText/expressions/kt30020.fir.ir.txt index 0510cd18198..700e1644fcd 100644 --- a/compiler/testData/ir/irText/expressions/kt30020.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/kt30020.fir.ir.txt @@ -155,11 +155,11 @@ FILE fqName: fileName:/kt30020.kt PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract size: kotlin.Int - FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.List) returnType:kotlin.Int [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:ABSTRACT [fake_override,val] overridden: public abstract fun (): kotlin.Int declared in kotlin.collections.MutableList - $this: VALUE_PARAMETER name: type:kotlin.collections.List + $this: VALUE_PARAMETER name: type:kotlin.collections.MutableList CLASS INTERFACE name:X modality:ABSTRACT visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.X FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/testData/ir/irText/expressions/kt30020.kt b/compiler/testData/ir/irText/expressions/kt30020.kt index 4a4bc6cd28c..a4d909bf6f8 100644 --- a/compiler/testData/ir/irText/expressions/kt30020.kt +++ b/compiler/testData/ir/irText/expressions/kt30020.kt @@ -1,8 +1,7 @@ // WITH_STDLIB // IGNORE_BACKEND_K1: JS_IR, JS_IR_ES6 +// IGNORE_BACKEND_K2: JS_IR, JS_IR_ES6 // ^ MutableList has js specific methods -// IGNORE_BACKEND_K2: JS_IR, JS_IR_ES6, NATIVE -// ^ the order of fake overrides is different on K2 interface X { val xs: MutableList diff --git a/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.ir.txt index bce0e452e1e..fc213427484 100644 --- a/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.ir.txt @@ -150,8 +150,8 @@ FILE fqName: fileName:/1.kt PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: public open size: kotlin.Int - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:java.util.ArrayList<@[FlexibleNullability] kotlin.Any?>) returnType:kotlin.Int [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.Java1) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: public open fun (): kotlin.Int declared in .Java1 - $this: VALUE_PARAMETER name: type:java.util.ArrayList<@[FlexibleNullability] kotlin.Any?> + $this: VALUE_PARAMETER name: type:.Java1 diff --git a/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.sig.kt.txt index b8fc8deb35c..105e216ee79 100644 --- a/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/fakeOverrideOfRawJavaCollection.fir.sig.kt.txt @@ -22,16 +22,12 @@ abstract class E : Java1 { // CHECK JVM_IR: // Mangled name: E#addAll(kotlin.collections.Collection){}kotlin.Boolean - // Mangled name for the signature by IR: addAll(kotlin.collections.Collection){}kotlin.Boolean - // Mangled name for the signature by Frontend: addAll(kotlin.collections.Collection{EnhancedNullability}){}kotlin.Boolean // Public signature: /E.addAll|1853624435708785695[0] // Public signature debug description: addAll(kotlin.collections.Collection){}kotlin.Boolean /* fake */ override fun addAll(p0: Collection): Boolean // CHECK JVM_IR: // Mangled name: E#addAll(kotlin.Int;kotlin.collections.Collection){}kotlin.Boolean - // Mangled name for the signature by IR: addAll(kotlin.Int;kotlin.collections.Collection){}kotlin.Boolean - // Mangled name for the signature by Frontend: addAll(kotlin.Int;kotlin.collections.Collection{EnhancedNullability}){}kotlin.Boolean // Public signature: /E.addAll|-92648757594494376[0] // Public signature debug description: addAll(kotlin.Int;kotlin.collections.Collection){}kotlin.Boolean /* fake */ override fun addAll(p0: Int, p1: Collection): Boolean @@ -98,8 +94,6 @@ abstract class E : Java1 { // CHECK JVM_IR: // Mangled name: E#iterator(){}kotlin.collections.MutableIterator - // Mangled name for the signature by IR: iterator(){}kotlin.collections.MutableIterator - // Mangled name for the signature by Frontend: iterator(){}kotlin.collections.MutableIterator{EnhancedNullability} // Public signature: /E.iterator|5172039261324384933[0] // Public signature debug description: iterator(){}kotlin.collections.MutableIterator /* fake */ override operator fun iterator(): MutableIterator @@ -112,16 +106,12 @@ abstract class E : Java1 { // CHECK JVM_IR: // Mangled name: E#listIterator(){}kotlin.collections.MutableListIterator - // Mangled name for the signature by IR: listIterator(){}kotlin.collections.MutableListIterator - // Mangled name for the signature by Frontend: listIterator(){}kotlin.collections.MutableListIterator{EnhancedNullability} // Public signature: /E.listIterator|-1621664620524293242[0] // Public signature debug description: listIterator(){}kotlin.collections.MutableListIterator /* fake */ override fun listIterator(): MutableListIterator // CHECK JVM_IR: // Mangled name: E#listIterator(kotlin.Int){}kotlin.collections.MutableListIterator - // Mangled name for the signature by IR: listIterator(kotlin.Int){}kotlin.collections.MutableListIterator - // Mangled name for the signature by Frontend: listIterator(kotlin.Int){}kotlin.collections.MutableListIterator{EnhancedNullability} // Public signature: /E.listIterator|2617555913478172101[0] // Public signature debug description: listIterator(kotlin.Int){}kotlin.collections.MutableListIterator /* fake */ override fun listIterator(p0: Int): MutableListIterator @@ -164,8 +154,6 @@ abstract class E : Java1 { // CHECK JVM_IR: // Mangled name: E#subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList - // Mangled name for the signature by IR: subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList - // Mangled name for the signature by Frontend: subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList{EnhancedNullability} // Public signature: /E.subList|5649745263147539891[0] // Public signature debug description: subList(kotlin.Int;kotlin.Int){}kotlin.collections.MutableList /* fake */ override fun subList(p0: Int, p1: Int): MutableList diff --git a/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.ir.txt index 38db8987644..d9d2d7d2a64 100644 --- a/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.ir.txt @@ -99,7 +99,7 @@ FILE fqName: fileName:/1.kt public open fun listIterator (p0: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] E of java.util.ArrayList> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:java.util.ArrayList VALUE_PARAMETER name:p0 index:0 type:kotlin.Int - FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.Int?> [fake_override] + FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.Int?> [fake_override] overridden: public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection @@ -155,7 +155,7 @@ FILE fqName: fileName:/1.kt overridden: public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:java.util.ArrayList - FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.Int?> [fake_override] + FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.Int?> [fake_override] overridden: public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection diff --git a/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.sig.kt.txt b/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.sig.kt.txt index 0381c5b5193..137b69a709d 100644 --- a/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/fakeOverrides/intersectionWithMappedSignature.fir.sig.kt.txt @@ -124,8 +124,6 @@ abstract class B : ArrayList, Java1 { // CHECK JVM_IR: // Mangled name: B#parallelStream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by IR: parallelStream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by Frontend: parallelStream(){}java.util.stream.Stream{EnhancedNullability} // Public signature: /B.parallelStream|-8395108522211591010[0] // Public signature debug description: parallelStream(){}java.util.stream.Stream{EnhancedNullability} /* fake */ override fun parallelStream(): @EnhancedNullability Stream<@EnhancedNullability Int?> @@ -192,8 +190,6 @@ abstract class B : ArrayList, Java1 { // CHECK JVM_IR: // Mangled name: B#stream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by IR: stream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by Frontend: stream(){}java.util.stream.Stream{EnhancedNullability} // Public signature: /B.stream|1565529915260485250[0] // Public signature debug description: stream(){}java.util.stream.Stream{EnhancedNullability} /* fake */ override fun stream(): @EnhancedNullability Stream<@EnhancedNullability Int?> diff --git a/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.__JavaChild.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.__JavaChild.fir.ir.txt index 59039e3846d..e25bd8be490 100644 --- a/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.__JavaChild.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.__JavaChild.fir.ir.txt @@ -38,6 +38,12 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:JavaChild modality:OPEN visib overridden: public final fun (): kotlin.Int declared in .KotlinBase $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:.JavaChild + FUN FAKE_OVERRIDE name: visibility:private modality:FINAL <> ($this:.JavaChild, value:kotlin.Int) returnType:kotlin.Unit [fake_override] + correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:FINAL [fake_override,var] + overridden: + private final fun (: kotlin.Int): kotlin.Unit declared in .KotlinBase + $this: VALUE_PARAMETER FAKE_OVERRIDE name: type:.JavaChild + VALUE_PARAMETER name:value index:0 type:kotlin.Int PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var] overridden: public final d: kotlin.Int [var] diff --git a/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.fir.ir.txt b/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.fir.ir.txt index c6c05a006d8..d0d7a2c7272 100644 --- a/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.fir.ir.txt +++ b/compiler/testData/ir/irText/fakeOverrides/setterVisibliityWithJava.fir.ir.txt @@ -21,53 +21,53 @@ FILE fqName: fileName:/1.kt PROPERTY FAKE_OVERRIDE name:a visibility:public modality:FINAL [fake_override,var] overridden: public final a: kotlin.Int - FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.KotlinBase) returnType:kotlin.Int [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.JavaChild) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:a visibility:public modality:FINAL [fake_override,var] overridden: public final fun (): kotlin.Int declared in .JavaChild - $this: VALUE_PARAMETER name: type:.KotlinBase - FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.KotlinBase, :kotlin.Int) returnType:kotlin.Unit [fake_override] + $this: VALUE_PARAMETER name: type:.JavaChild + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.JavaChild, :kotlin.Int) returnType:kotlin.Unit [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:a visibility:public modality:FINAL [fake_override,var] overridden: public final fun (: kotlin.Int): kotlin.Unit declared in .JavaChild - $this: VALUE_PARAMETER name: type:.KotlinBase + $this: VALUE_PARAMETER name: type:.JavaChild VALUE_PARAMETER name: index:0 type:kotlin.Int PROPERTY FAKE_OVERRIDE name:b visibility:public modality:FINAL [fake_override,var] overridden: public final b: kotlin.Int - FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.KotlinBase) returnType:kotlin.Int [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.JavaChild) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:b visibility:public modality:FINAL [fake_override,var] overridden: public final fun (): kotlin.Int declared in .JavaChild - $this: VALUE_PARAMETER name: type:.KotlinBase - FUN FAKE_OVERRIDE name: visibility:protected modality:FINAL <> ($this:.KotlinBase, :kotlin.Int) returnType:kotlin.Unit [fake_override] + $this: VALUE_PARAMETER name: type:.JavaChild + FUN FAKE_OVERRIDE name: visibility:protected modality:FINAL <> ($this:.JavaChild, value:kotlin.Int) returnType:kotlin.Unit [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:b visibility:public modality:FINAL [fake_override,var] overridden: protected final fun (value: kotlin.Int): kotlin.Unit declared in .JavaChild - $this: VALUE_PARAMETER name: type:.KotlinBase - VALUE_PARAMETER name: index:0 type:kotlin.Int + $this: VALUE_PARAMETER name: type:.JavaChild + VALUE_PARAMETER name:value index:0 type:kotlin.Int PROPERTY FAKE_OVERRIDE name:c visibility:public modality:FINAL [fake_override,var] overridden: public final c: kotlin.Int - FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.KotlinBase) returnType:kotlin.Int [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.JavaChild) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:c visibility:public modality:FINAL [fake_override,var] overridden: public final fun (): kotlin.Int declared in .JavaChild - $this: VALUE_PARAMETER name: type:.KotlinBase + $this: VALUE_PARAMETER name: type:.JavaChild PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var] overridden: public final d: kotlin.Int - FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.KotlinBase) returnType:kotlin.Int [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:.JavaChild) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var] overridden: public final fun (): kotlin.Int declared in .JavaChild - $this: VALUE_PARAMETER name: type:.KotlinBase - FUN FAKE_OVERRIDE name: visibility:internal modality:FINAL <> ($this:.KotlinBase, :kotlin.Int) returnType:kotlin.Unit [fake_override] + $this: VALUE_PARAMETER name: type:.JavaChild + FUN FAKE_OVERRIDE name: visibility:internal modality:FINAL <> ($this:.JavaChild, value:kotlin.Int) returnType:kotlin.Unit [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:d visibility:public modality:FINAL [fake_override,var] overridden: internal final fun (value: kotlin.Int): kotlin.Unit declared in .JavaChild - $this: VALUE_PARAMETER name: type:.KotlinBase - VALUE_PARAMETER name: index:0 type:kotlin.Int + $this: VALUE_PARAMETER name: type:.JavaChild + VALUE_PARAMETER name:value index:0 type:kotlin.Int PROPERTY FAKE_OVERRIDE name:e visibility:public modality:OPEN [fake_override,var] overridden: public open e: kotlin.Int diff --git a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt index b9c871f29fb..2612771bba9 100644 --- a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt @@ -29,12 +29,12 @@ FILE fqName: fileName:/AbstractMutableMap.kt $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap.MyMap, V of .MyMap> VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] K of .MyMap VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] java.util.function.Function.MyMap, out @[EnhancedNullability] V of .MyMap> - FUN FAKE_OVERRIDE name:computeIfPresent visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, p0:@[EnhancedNullability] K of .MyMap, p1:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in V of .MyMap, out @[EnhancedNullability] V of .MyMap?>) returnType:@[EnhancedNullability] V of .MyMap? [fake_override] + FUN FAKE_OVERRIDE name:computeIfPresent visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, p0:@[EnhancedNullability] K of .MyMap, p1:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in @[EnhancedNullability] {V of .MyMap & Any}, out @[EnhancedNullability] V of .MyMap?>) returnType:@[EnhancedNullability] V of .MyMap? [fake_override] overridden: public open fun computeIfPresent (p0: @[EnhancedNullability] K of kotlin.collections.AbstractMutableMap, p1: @[EnhancedNullability] java.util.function.BiFunction): @[EnhancedNullability] V of kotlin.collections.AbstractMutableMap? declared in kotlin.collections.AbstractMutableMap $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap.MyMap, V of .MyMap> VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] K of .MyMap - VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in V of .MyMap, out @[EnhancedNullability] V of .MyMap?> + VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in @[EnhancedNullability] {V of .MyMap & Any}, out @[EnhancedNullability] V of .MyMap?> FUN FAKE_OVERRIDE name:containsKey visibility:public modality:OPEN <> ($this:kotlin.collections.Map.MyMap, V of .MyMap>, key:K of .MyMap) returnType:kotlin.Boolean [fake_override] overridden: public open fun containsKey (key: K of kotlin.collections.AbstractMutableMap): kotlin.Boolean declared in kotlin.collections.AbstractMutableMap @@ -77,13 +77,13 @@ FILE fqName: fileName:/AbstractMutableMap.kt overridden: public open fun isEmpty (): kotlin.Boolean declared in kotlin.collections.AbstractMutableMap $this: VALUE_PARAMETER name: type:kotlin.collections.Map.MyMap, V of .MyMap> - FUN FAKE_OVERRIDE name:merge visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, p0:@[EnhancedNullability] K of .MyMap, p1:@[EnhancedNullability] {V of .MyMap & Any}, p2:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in V of .MyMap, out @[EnhancedNullability] V of .MyMap?>) returnType:@[EnhancedNullability] V of .MyMap? [fake_override] + FUN FAKE_OVERRIDE name:merge visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, p0:@[EnhancedNullability] K of .MyMap, p1:@[EnhancedNullability] {V of .MyMap & Any}, p2:@[EnhancedNullability] java.util.function.BiFunction.MyMap & Any}, in @[EnhancedNullability] {V of .MyMap & Any}, out @[EnhancedNullability] V of .MyMap?>) returnType:@[EnhancedNullability] V of .MyMap? [fake_override] overridden: public open fun merge (p0: @[EnhancedNullability] K of kotlin.collections.AbstractMutableMap, p1: @[EnhancedNullability] {V of kotlin.collections.AbstractMutableMap & Any}, p2: @[EnhancedNullability] java.util.function.BiFunction): @[EnhancedNullability] V of kotlin.collections.AbstractMutableMap? declared in kotlin.collections.AbstractMutableMap $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap.MyMap, V of .MyMap> VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] K of .MyMap VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] {V of .MyMap & Any} - VALUE_PARAMETER name:p2 index:2 type:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in V of .MyMap, out @[EnhancedNullability] V of .MyMap?> + VALUE_PARAMETER name:p2 index:2 type:@[EnhancedNullability] java.util.function.BiFunction.MyMap & Any}, in @[EnhancedNullability] {V of .MyMap & Any}, out @[EnhancedNullability] V of .MyMap?> FUN FAKE_OVERRIDE name:putAll visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, from:kotlin.collections.Map.MyMap, V of .MyMap>) returnType:kotlin.Unit [fake_override] overridden: public open fun putAll (from: kotlin.collections.Map): kotlin.Unit declared in kotlin.collections.AbstractMutableMap @@ -143,27 +143,27 @@ FILE fqName: fileName:/AbstractMutableMap.kt PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: public open keys: kotlin.collections.MutableSet - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>) returnType:kotlin.collections.MutableSet.MyMap> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:kotlin.collections.AbstractMutableMap.MyMap, V of .MyMap>) returnType:kotlin.collections.MutableSet.MyMap> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:keys visibility:public modality:OPEN [fake_override,val] overridden: public open fun (): kotlin.collections.MutableSet declared in kotlin.collections.AbstractMutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap.MyMap, V of .MyMap> + $this: VALUE_PARAMETER name: type:kotlin.collections.AbstractMutableMap.MyMap, V of .MyMap> PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: public open size: kotlin.Int - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:kotlin.collections.Map.MyMap, V of .MyMap>) returnType:kotlin.Int [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:kotlin.collections.AbstractMutableMap.MyMap, V of .MyMap>) returnType:kotlin.Int [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:size visibility:public modality:OPEN [fake_override,val] overridden: public open fun (): kotlin.Int declared in kotlin.collections.AbstractMutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.Map.MyMap, V of .MyMap> + $this: VALUE_PARAMETER name: type:kotlin.collections.AbstractMutableMap.MyMap, V of .MyMap> PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: public open values: kotlin.collections.MutableCollection - FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>) returnType:kotlin.collections.MutableCollection.MyMap> [fake_override] + FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:kotlin.collections.AbstractMutableMap.MyMap, V of .MyMap>) returnType:kotlin.collections.MutableCollection.MyMap> [fake_override] correspondingProperty: PROPERTY FAKE_OVERRIDE name:values visibility:public modality:OPEN [fake_override,val] overridden: public open fun (): kotlin.collections.MutableCollection declared in kotlin.collections.AbstractMutableMap - $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap.MyMap, V of .MyMap> + $this: VALUE_PARAMETER name: type:kotlin.collections.AbstractMutableMap.MyMap, V of .MyMap> PROPERTY name:entries visibility:public modality:OPEN [val] overridden: public abstract entries: kotlin.collections.MutableSet> diff --git a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.sig.kt.txt b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.sig.kt.txt index 4bd85f52614..2b9d0152171 100644 --- a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.sig.kt.txt @@ -33,12 +33,10 @@ class MyMap : AbstractMutableMap { /* fake */ override fun computeIfAbsent(p0: @EnhancedNullability K, p1: @EnhancedNullability Function): @EnhancedNullability V // CHECK JVM_IR: - // Mangled name: MyMap#computeIfPresent(1:0{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - // Mangled name for the signature by IR: computeIfPresent(1:0{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - // Mangled name for the signature by Frontend: computeIfPresent(1:0{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - // Public signature: /MyMap.computeIfPresent|-1851789104614376895[0] - // Public signature debug description: computeIfPresent(1:0{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - /* fake */ override fun computeIfPresent(p0: @EnhancedNullability K, p1: @EnhancedNullability BiFunction): @EnhancedNullability V? + // Mangled name: MyMap#computeIfPresent(1:0{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} + // Public signature: /MyMap.computeIfPresent|-5841525018102765873[0] + // Public signature debug description: computeIfPresent(1:0{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} + /* fake */ override fun computeIfPresent(p0: @EnhancedNullability K, p1: @EnhancedNullability BiFunction): @EnhancedNullability V? // CHECK JVM_IR: // Mangled name: MyMap#containsKey(1:0){}kotlin.Boolean @@ -83,12 +81,10 @@ class MyMap : AbstractMutableMap { /* fake */ override fun isEmpty(): Boolean // CHECK JVM_IR: - // Mangled name: MyMap#merge(1:0{EnhancedNullability};1:1{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - // Mangled name for the signature by IR: merge(1:0{EnhancedNullability};1:1{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - // Mangled name for the signature by Frontend: merge(1:0{EnhancedNullability};1:1{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - // Public signature: /MyMap.merge|8399995756928830847[0] - // Public signature debug description: merge(1:0{EnhancedNullability};1:1{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} - /* fake */ override fun merge(p0: @EnhancedNullability K, p1: @EnhancedNullability (V & Any), p2: @EnhancedNullability BiFunction): @EnhancedNullability V? + // Mangled name: MyMap#merge(1:0{EnhancedNullability};1:1{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} + // Public signature: /MyMap.merge|5784030730910430027[0] + // Public signature debug description: merge(1:0{EnhancedNullability};1:1{EnhancedNullability};java.util.function.BiFunction{EnhancedNullability}){}1:1?{EnhancedNullability} + /* fake */ override fun merge(p0: @EnhancedNullability K, p1: @EnhancedNullability (V & Any), p2: @EnhancedNullability BiFunction): @EnhancedNullability V? // CHECK: // Mangled name: MyMap#putAll(kotlin.collections.Map){} diff --git a/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.ir.txt b/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.ir.txt index 72100d6837c..7f05be71e93 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.ir.txt @@ -97,7 +97,7 @@ FILE fqName: fileName:/ArrayListOverrides.kt public open fun listIterator (p0: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] E of java.util.ArrayList> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:java.util.ArrayList VALUE_PARAMETER name:p0 index:0 type:kotlin.Int - FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.String?> [fake_override] + FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.String?> [fake_override] overridden: public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection @@ -152,7 +152,7 @@ FILE fqName: fileName:/ArrayListOverrides.kt overridden: public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:java.util.ArrayList - FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.String?> [fake_override] + FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.String?> [fake_override] overridden: public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection @@ -286,7 +286,7 @@ FILE fqName: fileName:/ArrayListOverrides.kt public open fun listIterator (p0: kotlin.Int): @[EnhancedNullability] kotlin.collections.MutableListIterator<@[EnhancedNullability] E of java.util.ArrayList> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:java.util.ArrayList VALUE_PARAMETER name:p0 index:0 type:kotlin.Int - FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.String?> [fake_override] + FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.String?> [fake_override] overridden: public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection @@ -336,7 +336,7 @@ FILE fqName: fileName:/ArrayListOverrides.kt overridden: public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:java.util.ArrayList - FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] kotlin.String?> [fake_override] + FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection) returnType:@[EnhancedNullability] java.util.stream.Stream<@[FlexibleNullability] @[EnhancedNullability] kotlin.String?> [fake_override] overridden: public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection diff --git a/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.sig.kt.txt b/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.sig.kt.txt index b482fae8089..c40f09e3c8d 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.sig.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayListOverrides.fir.sig.kt.txt @@ -124,8 +124,6 @@ class A1 : ArrayList { // CHECK JVM_IR: // Mangled name: A1#parallelStream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by IR: parallelStream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by Frontend: parallelStream(){}java.util.stream.Stream{EnhancedNullability} // Public signature: /A1.parallelStream|3092772522219636263[0] // Public signature debug description: parallelStream(){}java.util.stream.Stream{EnhancedNullability} /* fake */ override fun parallelStream(): @EnhancedNullability Stream<@EnhancedNullability String?> @@ -192,8 +190,6 @@ class A1 : ArrayList { // CHECK JVM_IR: // Mangled name: A1#stream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by IR: stream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by Frontend: stream(){}java.util.stream.Stream{EnhancedNullability} // Public signature: /A1.stream|6909137692784416467[0] // Public signature debug description: stream(){}java.util.stream.Stream{EnhancedNullability} /* fake */ override fun stream(): @EnhancedNullability Stream<@EnhancedNullability String?> @@ -367,8 +363,6 @@ class A2 : ArrayList { // CHECK JVM_IR: // Mangled name: A2#parallelStream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by IR: parallelStream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by Frontend: parallelStream(){}java.util.stream.Stream{EnhancedNullability} // Public signature: /A2.parallelStream|3092772522219636263[0] // Public signature debug description: parallelStream(){}java.util.stream.Stream{EnhancedNullability} /* fake */ override fun parallelStream(): @EnhancedNullability Stream<@EnhancedNullability String?> @@ -429,8 +423,6 @@ class A2 : ArrayList { // CHECK JVM_IR: // Mangled name: A2#stream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by IR: stream(){}java.util.stream.Stream{EnhancedNullability} - // Mangled name for the signature by Frontend: stream(){}java.util.stream.Stream{EnhancedNullability} // Public signature: /A2.stream|6909137692784416467[0] // Public signature debug description: stream(){}java.util.stream.Stream{EnhancedNullability} /* fake */ override fun stream(): @EnhancedNullability Stream<@EnhancedNullability String?> diff --git a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt index aecbabfacf2..5b9c04b37ae 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt @@ -154,7 +154,7 @@ FILE fqName: fileName:/ArrayMap.kt value: GET_VAR 'value: T of .ArrayMapImpl.Entry declared in .ArrayMapImpl.Entry.copy' type=T of .ArrayMapImpl.Entry origin=null FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.ArrayMapImpl.Entry.ArrayMapImpl.Entry>, other:kotlin.Any?) returnType:kotlin.Boolean [operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.collections.Map.Entry $this: VALUE_PARAMETER name: type:.ArrayMapImpl.Entry.ArrayMapImpl.Entry> VALUE_PARAMETER name:other index:0 type:kotlin.Any? BLOCK_BODY @@ -198,7 +198,7 @@ FILE fqName: fileName:/ArrayMap.kt CONST Boolean type=kotlin.Boolean value=true FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.ArrayMapImpl.Entry.ArrayMapImpl.Entry>) returnType:kotlin.Int overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any + public open fun hashCode (): kotlin.Int declared in kotlin.collections.Map.Entry $this: VALUE_PARAMETER name: type:.ArrayMapImpl.Entry.ArrayMapImpl.Entry> BLOCK_BODY VAR name:result type:kotlin.Int [var] @@ -226,7 +226,7 @@ FILE fqName: fileName:/ArrayMap.kt GET_VAR 'var result: kotlin.Int declared in .ArrayMapImpl.Entry.hashCode' type=kotlin.Int origin=null FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.ArrayMapImpl.Entry.ArrayMapImpl.Entry>) returnType:kotlin.String overridden: - public open fun toString (): kotlin.String declared in kotlin.Any + public open fun toString (): kotlin.String declared in kotlin.collections.Map.Entry $this: VALUE_PARAMETER name: type:.ArrayMapImpl.Entry.ArrayMapImpl.Entry> BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .ArrayMapImpl.Entry' diff --git a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.ir.txt b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.ir.txt deleted file mode 100644 index 31467f73e50..00000000000 --- a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.ir.txt +++ /dev/null @@ -1,256 +0,0 @@ -FILE fqName: fileName:/ImplicitReceiverStack.kt - CLASS CLASS name:ImplicitReceiverStack modality:ABSTRACT visibility:public superTypes:[kotlin.collections.Iterable<.ImplicitReceiverValue<*>>] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ImplicitReceiverStack - CONSTRUCTOR visibility:public <> () returnType:.ImplicitReceiverStack [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ImplicitReceiverStack modality:ABSTRACT visibility:public superTypes:[kotlin.collections.Iterable<.ImplicitReceiverValue<*>>]' - 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 declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<.ImplicitReceiverValue<*>>, p0:@[FlexibleNullability] java.util.function.Consumer.ImplicitReceiverValue<*>?>?) returnType:kotlin.Unit [fake_override] - overridden: - public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer?): kotlin.Unit declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.collections.Iterable<.ImplicitReceiverValue<*>> - VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer.ImplicitReceiverValue<*>?>? - 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.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:iterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Iterable<.ImplicitReceiverValue<*>>) returnType:kotlin.collections.Iterator<.ImplicitReceiverValue<*>> [fake_override,operator] - overridden: - public abstract fun iterator (): kotlin.collections.Iterator declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.collections.Iterable<.ImplicitReceiverValue<*>> - FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<.ImplicitReceiverValue<*>>) returnType:@[EnhancedNullability] java.util.Spliterator<@[EnhancedNullability] .ImplicitReceiverValue<*>> [fake_override] - overridden: - public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[EnhancedNullability] T of kotlin.collections.Iterable> declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.collections.Iterable<.ImplicitReceiverValue<*>> - 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.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:get visibility:public modality:ABSTRACT <> ($this:.ImplicitReceiverStack, name:kotlin.String?) returnType:.ImplicitReceiverValue<*>? [operator] - $this: VALUE_PARAMETER name: type:.ImplicitReceiverStack - VALUE_PARAMETER name:name index:0 type:kotlin.String? - CLASS CLASS name:ImplicitReceiverValue modality:FINAL visibility:public superTypes:[.ReceiverValue] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ImplicitReceiverValue.ImplicitReceiverValue> - TYPE_PARAMETER name:S index:0 variance: superTypes:[.Symbol<*>] reified:false - PROPERTY name:boundSymbol visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:boundSymbol type:S of .ImplicitReceiverValue? visibility:private [final] - EXPRESSION_BODY - GET_VAR 'boundSymbol: S of .ImplicitReceiverValue? declared in .ImplicitReceiverValue.' type=S of .ImplicitReceiverValue? origin=INITIALIZE_PROPERTY_FROM_PARAMETER - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.ImplicitReceiverValue.ImplicitReceiverValue>) returnType:S of .ImplicitReceiverValue? - correspondingProperty: PROPERTY name:boundSymbol visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:.ImplicitReceiverValue.ImplicitReceiverValue> - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): S of .ImplicitReceiverValue? declared in .ImplicitReceiverValue' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:boundSymbol type:S of .ImplicitReceiverValue? visibility:private [final]' type=S of .ImplicitReceiverValue? origin=null - receiver: GET_VAR ': .ImplicitReceiverValue.ImplicitReceiverValue> declared in .ImplicitReceiverValue.' type=.ImplicitReceiverValue.ImplicitReceiverValue> origin=null - PROPERTY name:type visibility:public modality:OPEN [val] - overridden: - public abstract type: kotlin.String - FIELD PROPERTY_BACKING_FIELD name:type type:kotlin.String visibility:private [final] - EXPRESSION_BODY - GET_VAR 'type: kotlin.String declared in .ImplicitReceiverValue.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:.ImplicitReceiverValue.ImplicitReceiverValue>) returnType:kotlin.String - correspondingProperty: PROPERTY name:type visibility:public modality:OPEN [val] - overridden: - public abstract fun (): kotlin.String declared in .ReceiverValue - $this: VALUE_PARAMETER name: type:.ImplicitReceiverValue.ImplicitReceiverValue> - BLOCK_BODY - RETURN type=kotlin.Nothing from='public open fun (): kotlin.String declared in .ImplicitReceiverValue' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:type type:kotlin.String visibility:private [final]' type=kotlin.String origin=null - receiver: GET_VAR ': .ImplicitReceiverValue.ImplicitReceiverValue> declared in .ImplicitReceiverValue.' type=.ImplicitReceiverValue.ImplicitReceiverValue> origin=null - CONSTRUCTOR visibility:public <> (boundSymbol:S of .ImplicitReceiverValue?, type:kotlin.String) returnType:.ImplicitReceiverValue.ImplicitReceiverValue> [primary] - VALUE_PARAMETER name:boundSymbol index:0 type:S of .ImplicitReceiverValue? - VALUE_PARAMETER name:type index:1 type:kotlin.String - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ImplicitReceiverValue modality:FINAL visibility:public superTypes:[.ReceiverValue]' - 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 declared in .ReceiverValue - $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 .ReceiverValue - $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 .ReceiverValue - $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:PersistentImplicitReceiverStack modality:FINAL visibility:public superTypes:[.ImplicitReceiverStack; kotlin.collections.Iterable<.ImplicitReceiverValue<*>>] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.PersistentImplicitReceiverStack - PROPERTY name:stack visibility:private modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:stack type:kotlin.collections.List<.ImplicitReceiverValue<*>> visibility:private [final] - EXPRESSION_BODY - GET_VAR 'stack: kotlin.collections.List<.ImplicitReceiverValue<*>> declared in .PersistentImplicitReceiverStack.' type=kotlin.collections.List<.ImplicitReceiverValue<*>> origin=INITIALIZE_PROPERTY_FROM_PARAMETER - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:.PersistentImplicitReceiverStack) returnType:kotlin.collections.List<.ImplicitReceiverValue<*>> - correspondingProperty: PROPERTY name:stack visibility:private modality:FINAL [val] - $this: VALUE_PARAMETER name: type:.PersistentImplicitReceiverStack - BLOCK_BODY - RETURN type=kotlin.Nothing from='private final fun (): kotlin.collections.List<.ImplicitReceiverValue<*>> declared in .PersistentImplicitReceiverStack' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stack type:kotlin.collections.List<.ImplicitReceiverValue<*>> visibility:private [final]' type=kotlin.collections.List<.ImplicitReceiverValue<*>> origin=null - receiver: GET_VAR ': .PersistentImplicitReceiverStack declared in .PersistentImplicitReceiverStack.' type=.PersistentImplicitReceiverStack origin=null - CONSTRUCTOR visibility:public <> (stack:kotlin.collections.List<.ImplicitReceiverValue<*>>) returnType:.PersistentImplicitReceiverStack [primary] - VALUE_PARAMETER name:stack index:0 type:kotlin.collections.List<.ImplicitReceiverValue<*>> - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in .ImplicitReceiverStack' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:PersistentImplicitReceiverStack modality:FINAL visibility:public superTypes:[.ImplicitReceiverStack; kotlin.collections.Iterable<.ImplicitReceiverValue<*>>]' - 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 declared in .ImplicitReceiverStack - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:forEach visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<.ImplicitReceiverValue<*>>, p0:@[FlexibleNullability] java.util.function.Consumer.ImplicitReceiverValue<*>?>?) returnType:kotlin.Unit [fake_override] - overridden: - public open fun forEach (p0: @[FlexibleNullability] java.util.function.Consumer.ImplicitReceiverValue<*>?>?): kotlin.Unit declared in .ImplicitReceiverStack - $this: VALUE_PARAMETER name: type:kotlin.collections.Iterable<.ImplicitReceiverValue<*>> - VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] java.util.function.Consumer.ImplicitReceiverValue<*>?>? - 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 .ImplicitReceiverStack - public open fun hashCode (): kotlin.Int declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:spliterator visibility:public modality:OPEN <> ($this:kotlin.collections.Iterable<.ImplicitReceiverValue<*>>) returnType:@[EnhancedNullability] java.util.Spliterator<@[EnhancedNullability] .ImplicitReceiverValue<*>> [fake_override] - overridden: - public open fun spliterator (): @[EnhancedNullability] java.util.Spliterator<@[EnhancedNullability] .ImplicitReceiverValue<*>> declared in .ImplicitReceiverStack - $this: VALUE_PARAMETER name: type:kotlin.collections.Iterable<.ImplicitReceiverValue<*>> - 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 .ImplicitReceiverStack - public open fun toString (): kotlin.String declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:get visibility:public modality:OPEN <> ($this:.PersistentImplicitReceiverStack, name:kotlin.String?) returnType:.ImplicitReceiverValue<*>? [operator] - overridden: - public abstract fun get (name: kotlin.String?): .ImplicitReceiverValue<*>? declared in .ImplicitReceiverStack - $this: VALUE_PARAMETER name: type:.PersistentImplicitReceiverStack - VALUE_PARAMETER name:name index:0 type:kotlin.String? - BLOCK_BODY - RETURN type=kotlin.Nothing from='public open fun get (name: kotlin.String?): .ImplicitReceiverValue<*>? declared in .PersistentImplicitReceiverStack' - CALL 'public final fun lastOrNull (): T of kotlin.collections.lastOrNull? declared in kotlin.collections' type=.ImplicitReceiverValue<*>? origin=null - : .ImplicitReceiverValue<*> - $receiver: CALL 'private final fun (): kotlin.collections.List<.ImplicitReceiverValue<*>> declared in .PersistentImplicitReceiverStack' type=kotlin.collections.List<.ImplicitReceiverValue<*>> origin=GET_PROPERTY - $this: GET_VAR ': .PersistentImplicitReceiverStack declared in .PersistentImplicitReceiverStack.get' type=.PersistentImplicitReceiverStack origin=null - FUN name:iterator visibility:public modality:OPEN <> ($this:.PersistentImplicitReceiverStack) returnType:kotlin.collections.Iterator<.ImplicitReceiverValue<*>> [operator] - overridden: - public abstract fun iterator (): kotlin.collections.Iterator<.ImplicitReceiverValue<*>> declared in .ImplicitReceiverStack - public abstract fun iterator (): kotlin.collections.Iterator declared in kotlin.collections.Iterable - $this: VALUE_PARAMETER name: type:.PersistentImplicitReceiverStack - BLOCK_BODY - RETURN type=kotlin.Nothing from='public open fun iterator (): kotlin.collections.Iterator<.ImplicitReceiverValue<*>> declared in .PersistentImplicitReceiverStack' - CALL 'public abstract fun iterator (): kotlin.collections.Iterator declared in kotlin.collections.List' type=kotlin.collections.Iterator<.ImplicitReceiverValue<*>> origin=null - $this: CALL 'private final fun (): kotlin.collections.List<.ImplicitReceiverValue<*>> declared in .PersistentImplicitReceiverStack' type=kotlin.collections.List<.ImplicitReceiverValue<*>> origin=GET_PROPERTY - $this: GET_VAR ': .PersistentImplicitReceiverStack declared in .PersistentImplicitReceiverStack.iterator' type=.PersistentImplicitReceiverStack origin=null - CLASS INTERFACE name:ReceiverValue modality:ABSTRACT visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ReceiverValue - 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 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 - PROPERTY name:type visibility:public modality:ABSTRACT [val] - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:ABSTRACT <> ($this:.ReceiverValue) returnType:kotlin.String - correspondingProperty: PROPERTY name:type visibility:public modality:ABSTRACT [val] - $this: VALUE_PARAMETER name: type:.ReceiverValue - CLASS INTERFACE name:Symbol modality:ABSTRACT visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Symbol.Symbol> - TYPE_PARAMETER name:E index:0 variance: superTypes:[.SymbolOwner.Symbol>] reified:false - 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 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 INTERFACE name:SymbolOwner modality:ABSTRACT visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.SymbolOwner.SymbolOwner> - TYPE_PARAMETER name:E index:0 variance: superTypes:[.SymbolOwner.SymbolOwner>] reified:false - 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 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 - FUN name:bar visibility:public modality:FINAL <> (s:kotlin.String) returnType:kotlin.Unit - VALUE_PARAMETER name:s index:0 type:kotlin.String - BLOCK_BODY - FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - VAR name:stack type:.PersistentImplicitReceiverStack [val] - CONSTRUCTOR_CALL 'public constructor (stack: kotlin.collections.List<.ImplicitReceiverValue<*>>) declared in .PersistentImplicitReceiverStack' type=.PersistentImplicitReceiverStack origin=null - stack: CALL 'public final fun listOf (vararg elements: T of kotlin.collections.listOf): kotlin.collections.List declared in kotlin.collections' type=kotlin.collections.List<.ImplicitReceiverValue> origin=null - : .ImplicitReceiverValue - elements: VARARG type=kotlin.Array.ImplicitReceiverValue> varargElementType=.ImplicitReceiverValue - CONSTRUCTOR_CALL 'public constructor (boundSymbol: S of .ImplicitReceiverValue?, type: kotlin.String) declared in .ImplicitReceiverValue' type=.ImplicitReceiverValue origin=null - : kotlin.Nothing - boundSymbol: CONST Null type=kotlin.Nothing? value=null - type: CONST String type=kotlin.String value="O" - CONSTRUCTOR_CALL 'public constructor (boundSymbol: S of .ImplicitReceiverValue?, type: kotlin.String) declared in .ImplicitReceiverValue' type=.ImplicitReceiverValue origin=null - : kotlin.Nothing - boundSymbol: CONST Null type=kotlin.Nothing? value=null - type: CONST String type=kotlin.String value="K" - CALL 'public final fun foo (stack: .PersistentImplicitReceiverStack): kotlin.Unit declared in ' type=kotlin.Unit origin=null - stack: GET_VAR 'val stack: .PersistentImplicitReceiverStack declared in .box' type=.PersistentImplicitReceiverStack origin=null - RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' - CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUS - $this: CALL 'public open fun (): kotlin.String declared in .ImplicitReceiverValue' type=kotlin.String origin=GET_PROPERTY - $this: CALL 'public final fun first (): T of kotlin.collections.first declared in kotlin.collections' type=.ImplicitReceiverValue<*> origin=null - : .ImplicitReceiverValue<*> - $receiver: GET_VAR 'val stack: .PersistentImplicitReceiverStack declared in .box' type=.PersistentImplicitReceiverStack origin=null - other: BLOCK type=kotlin.String? origin=SAFE_CALL - VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:.ImplicitReceiverValue<*>? [val] - CALL 'public open fun get (name: kotlin.String?): .ImplicitReceiverValue<*>? declared in .PersistentImplicitReceiverStack' type=.ImplicitReceiverValue<*>? origin=GET_ARRAY_ELEMENT - $this: GET_VAR 'val stack: .PersistentImplicitReceiverStack declared in .box' type=.PersistentImplicitReceiverStack origin=null - name: CONST Null type=kotlin.Nothing? value=null - WHEN type=kotlin.String? origin=null - BRANCH - if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_VAR 'val tmp_0: .ImplicitReceiverValue<*>? declared in .box' type=.ImplicitReceiverValue<*>? origin=null - arg1: CONST Null type=kotlin.Nothing? value=null - then: CONST Null type=kotlin.Nothing? value=null - BRANCH - if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun (): kotlin.String declared in .ImplicitReceiverValue' type=kotlin.String origin=GET_PROPERTY - $this: GET_VAR 'val tmp_0: .ImplicitReceiverValue<*>? declared in .box' type=.ImplicitReceiverValue<*>? origin=null - FUN name:foo visibility:public modality:FINAL <> (stack:.PersistentImplicitReceiverStack) returnType:kotlin.Unit - VALUE_PARAMETER name:stack index:0 type:.PersistentImplicitReceiverStack - BLOCK_BODY - CALL 'public final fun forEach (action: kotlin.Function1): kotlin.Unit declared in kotlin.collections' type=kotlin.Unit origin=null - : .ImplicitReceiverValue<*> - $receiver: GET_VAR 'stack: .PersistentImplicitReceiverStack declared in .foo' type=.PersistentImplicitReceiverStack origin=null - action: FUN_EXPR type=kotlin.Function1<.ImplicitReceiverValue<*>, kotlin.Unit> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:.ImplicitReceiverValue<*>) returnType:kotlin.Unit - VALUE_PARAMETER name:it index:0 type:.ImplicitReceiverValue<*> - BLOCK_BODY - TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun (): S of .ImplicitReceiverValue? declared in .ImplicitReceiverValue' type=.Symbol<*>? origin=GET_PROPERTY - $this: GET_VAR 'it: .ImplicitReceiverValue<*> declared in .foo.' type=.ImplicitReceiverValue<*> origin=null - CALL 'public final fun bar (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null - s: CALL 'public open fun (): kotlin.String declared in .ImplicitReceiverValue' type=kotlin.String origin=GET_PROPERTY - $this: GET_VAR 'it: .ImplicitReceiverValue<*> declared in .foo.' type=.ImplicitReceiverValue<*> origin=null diff --git a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.kt.txt b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.kt.txt deleted file mode 100644 index 4c1cf31323d..00000000000 --- a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.fir.kt.txt +++ /dev/null @@ -1,84 +0,0 @@ -abstract class ImplicitReceiverStack : Iterable> { - constructor() /* primary */ { - super/*Any*/() - /* () */ - - } - - abstract operator fun get(name: String?): ImplicitReceiverValue<*>? - -} - -class ImplicitReceiverValue> : ReceiverValue { - val boundSymbol: S? - field = boundSymbol - get - - override val type: String - field = type - override get - - constructor(boundSymbol: S?, type: String) /* primary */ { - super/*Any*/() - /* () */ - - } - -} - -class PersistentImplicitReceiverStack : ImplicitReceiverStack, Iterable> { - private val stack: List> - field = stack - private get - - constructor(stack: List>) /* primary */ { - super/*ImplicitReceiverStack*/() - /* () */ - - } - - override operator fun get(name: String?): ImplicitReceiverValue<*>? { - return .().lastOrNull>() - } - - override operator fun iterator(): Iterator> { - return .().iterator() - } - -} - -interface ReceiverValue { - abstract val type: String - abstract get - -} - -interface Symbol> { -} - -interface SymbolOwner> { -} - -fun bar(s: String) { -} - -fun box(): String { - val stack: PersistentImplicitReceiverStack = PersistentImplicitReceiverStack(stack = listOf>(elements = [ImplicitReceiverValue(boundSymbol = null, type = "O"), ImplicitReceiverValue(boundSymbol = null, type = "K")])) - foo(stack = stack) - return stack.first>().().plus(other = { // BLOCK - val tmp_0: ImplicitReceiverValue<*>? = stack.get(name = null) - when { - EQEQ(arg0 = tmp_0, arg1 = null) -> null - else -> tmp_0.() - } - }) -} - -fun foo(stack: PersistentImplicitReceiverStack) { - stack.forEach>(action = local fun (it: ImplicitReceiverValue<*>) { - it.() /*~> Unit */ - bar(s = it.()) - } -) -} - diff --git a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt index e381b995335..dd377594339 100644 --- a/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt +++ b/compiler/testData/ir/irText/firProblems/ImplicitReceiverStack.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // TARGET_BACKEND: JVM // WITH_STDLIB // FULL_JDK diff --git a/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt b/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt index ed637a912fb..f3e78442bed 100644 --- a/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt @@ -402,6 +402,7 @@ FILE fqName: fileName:/MultiList.kt FUN FAKE_OVERRIDE name:parallelStream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<.Some.SomeList>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] .Some.SomeList>> [fake_override] overridden: public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] .Some.MyList>> declared in .MyList + public open fun parallelStream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection<.Some.SomeList>> FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:java.util.ArrayList<.Some.SomeList>>, p0:@[EnhancedNullability] .Some.SomeList>) returnType:kotlin.Boolean [fake_override] overridden: @@ -458,6 +459,7 @@ FILE fqName: fileName:/MultiList.kt FUN FAKE_OVERRIDE name:stream visibility:public modality:OPEN <> ($this:kotlin.collections.Collection<.Some.SomeList>>) returnType:@[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] .Some.SomeList>> [fake_override] overridden: public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] .Some.MyList>> declared in .MyList + public open fun stream (): @[EnhancedNullability] java.util.stream.Stream<@[EnhancedNullability] @[FlexibleNullability] E of java.util.ArrayList?> declared in java.util.ArrayList $this: VALUE_PARAMETER name: type:kotlin.collections.Collection<.Some.SomeList>> FUN FAKE_OVERRIDE name:subList visibility:public modality:OPEN <> ($this:java.util.ArrayList<.Some.SomeList>>, p0:kotlin.Int, p1:kotlin.Int) returnType:@[EnhancedNullability] kotlin.collections.MutableList<@[EnhancedNullability] .Some.SomeList>> [fake_override] overridden: diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.kt b/compiler/testData/ir/irText/firProblems/SignatureClash.kt index b20aad05d00..f46187c8e37 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.kt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.kt @@ -1,6 +1,4 @@ // FIR_IDENTICAL -// KT-64271 -// IGNORE_BACKEND_K2: JVM_IR typealias Some = (Any) -> String? @@ -23,4 +21,4 @@ interface Delegate : Base { interface Derived : Delegate -data class DataClass(val delegate: Delegate): Derived, Delegate by delegate \ No newline at end of file +data class DataClass(val delegate: Delegate): Derived, Delegate by delegate diff --git a/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt b/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt index de77b4dd147..8da2bdd9794 100644 --- a/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt +++ b/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt @@ -72,7 +72,7 @@ FILE fqName: fileName:/kt45236.kt value: GET_VAR 'value: T of .NetRequestStatus.Error? declared in .NetRequestStatus.Error.copy' type=T of .NetRequestStatus.Error? origin=null FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.NetRequestStatus.Error.NetRequestStatus.Error>, other:kotlin.Any?) returnType:kotlin.Boolean [operator] overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .NetRequestStatus $this: VALUE_PARAMETER name: type:.NetRequestStatus.Error.NetRequestStatus.Error> VALUE_PARAMETER name:other index:0 type:kotlin.Any? BLOCK_BODY @@ -116,7 +116,7 @@ FILE fqName: fileName:/kt45236.kt CONST Boolean type=kotlin.Boolean value=true FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.NetRequestStatus.Error.NetRequestStatus.Error>) returnType:kotlin.Int overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any + public open fun hashCode (): kotlin.Int declared in .NetRequestStatus $this: VALUE_PARAMETER name: type:.NetRequestStatus.Error.NetRequestStatus.Error> BLOCK_BODY VAR name:result type:kotlin.Int [var] @@ -144,7 +144,7 @@ FILE fqName: fileName:/kt45236.kt GET_VAR 'var result: kotlin.Int declared in .NetRequestStatus.Error.hashCode' type=kotlin.Int origin=null FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.NetRequestStatus.Error.NetRequestStatus.Error>) returnType:kotlin.String overridden: - public open fun toString (): kotlin.String declared in kotlin.Any + public open fun toString (): kotlin.String declared in .NetRequestStatus $this: VALUE_PARAMETER name: type:.NetRequestStatus.Error.NetRequestStatus.Error> BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .NetRequestStatus.Error' diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java index 00a89d53ca0..86ec11f0d70 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java @@ -21417,18 +21417,6 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { 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 000f1395eac..9494267a7e7 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 @@ -21417,18 +21417,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index 2dd450936d5..d7baa070bf9 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -21417,18 +21417,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java index 3ee53c841b7..d47a2c30401 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java @@ -21417,18 +21417,6 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir runTest("compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt"); } - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void testKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @Test - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void testKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @Test @TestMetadata("kotlinJavaStaticFromInterfaceAccidentalOverride.kt") public void testKotlinJavaStaticFromInterfaceAccidentalOverride() { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 8cc6b4712ec..be186fc94ee 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -17673,16 +17673,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/fir/emptyIntersectionWarning.kt"); } - @TestMetadata("kotlinJavaStaticAccidentalOverride.kt") - public void ignoreKotlinJavaStaticAccidentalOverride() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride.kt"); - } - - @TestMetadata("kotlinJavaStaticAccidentalOverride2.kt") - public void ignoreKotlinJavaStaticAccidentalOverride2() { - runTest("compiler/testData/codegen/box/fir/kotlinJavaStaticAccidentalOverride2.kt"); - } - @TestMetadata("selectingLambdas.kt") public void ignoreSelectingLambdas() { runTest("compiler/testData/codegen/box/fir/selectingLambdas.kt");