From 807d352ed4add3c545c0b6e77a9ec0d7be8d0e69 Mon Sep 17 00:00:00 2001 From: Pavel Kunyavskiy Date: Thu, 29 Feb 2024 14:39:40 +0100 Subject: [PATCH] [Tests] Add test for already fixed KT-60847 ^KT-60847 Fixed --- ...LFirBlackBoxCodegenBasedTestGenerated.java | 6 + ...rsedBlackBoxCodegenBasedTestGenerated.java | 6 + ...LightTreeBlackBoxCodegenTestGenerated.java | 6 + ...2IrFakeOverrideGeneratorTestGenerated.java | 6 + .../FirPsiBlackBoxCodegenTestGenerated.java | 6 + .../k2/mergedOverrides.fir.ir.txt | 118 ++++++++++++++++++ .../box/multiplatform/k2/mergedOverrides.kt | 34 +++++ .../fir/FirJsCodegenBoxTestGenerated.java | 6 + .../fir/FirJsES6CodegenBoxTestGenerated.java | 6 + .../FirNativeCodegenBoxTestGenerated.java | 6 + .../FirNativeCodegenBoxTestNoPLGenerated.java | 6 + .../FirWasmJsCodegenBoxTestGenerated.java | 6 + 12 files changed, 212 insertions(+) create mode 100644 compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.fir.ir.txt create mode 100644 compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt 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 2265ce0912a..9183e13cc0b 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 @@ -38295,6 +38295,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Test @TestMetadata("staticjavaFieldInCommonCode.kt") public void testStaticjavaFieldInCommonCode() { 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 05c77158f67..9c5c9c128a7 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 @@ -38295,6 +38295,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Test @TestMetadata("staticjavaFieldInCommonCode.kt") public void testStaticjavaFieldInCommonCode() { 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 c3f0a596217..863d1d44f8e 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 @@ -38140,6 +38140,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Test @TestMetadata("staticjavaFieldInCommonCode.kt") public void testStaticjavaFieldInCommonCode() { 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 070261edaa7..010c52270bf 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 @@ -38140,6 +38140,12 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Test @TestMetadata("staticjavaFieldInCommonCode.kt") public void testStaticjavaFieldInCommonCode() { 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 c32920f9e17..4f7ac82c4ed 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 @@ -38140,6 +38140,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/multiplatform/k2/jvmDeclarationsUpdatedMembersInCommonModule.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Test @TestMetadata("staticjavaFieldInCommonCode.kt") public void testStaticjavaFieldInCommonCode() { diff --git a/compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.fir.ir.txt b/compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.fir.ir.txt new file mode 100644 index 00000000000..7e5fb9019da --- /dev/null +++ b/compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.fir.ir.txt @@ -0,0 +1,118 @@ +FILE fqName: fileName:/common.kt + CLASS CLASS name:Derived modality:ABSTRACT visibility:public superTypes:[.Base; .OtherBase] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Derived + CONSTRUCTOR visibility:public <> () returnType:.Derived [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:ABSTRACT visibility:public superTypes:[.Base; .OtherBase]' + 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 .Base + public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .OtherBase + $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 .Base + public open fun hashCode (): kotlin.Int declared in .OtherBase + $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 .Base + public open fun toString (): kotlin.String declared in .OtherBase + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN name:foo visibility:public modality:OPEN <> ($this:.Derived, e:kotlin.String) returnType:kotlin.String + overridden: + public abstract fun foo (e: kotlin.String): kotlin.String declared in .Base + public abstract fun foo (e: kotlin.String): kotlin.String declared in .OtherBase + $this: VALUE_PARAMETER name: type:.Derived + VALUE_PARAMETER name:e index:0 type:kotlin.String + BLOCK_BODY + RETURN type=kotlin.Nothing from='public open fun foo (e: kotlin.String): kotlin.String declared in .Derived' + GET_VAR 'e: kotlin.String declared in .Derived.foo' type=kotlin.String origin=null + CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.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 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:foo visibility:public modality:ABSTRACT <> ($this:.Base, e:kotlin.String) returnType:kotlin.String + $this: VALUE_PARAMETER name: type:.Base + VALUE_PARAMETER name:e index:0 type:kotlin.String + CLASS INTERFACE name:OtherBase modality:ABSTRACT visibility:public superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.OtherBase + 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:foo visibility:public modality:ABSTRACT <> ($this:.OtherBase, e:kotlin.String) returnType:kotlin.String + $this: VALUE_PARAMETER name: type:.OtherBase + VALUE_PARAMETER name:e index:0 type:kotlin.String + FUN name:bar visibility:public modality:FINAL <> (d:.Derived, e:kotlin.String, f:kotlin.String) returnType:kotlin.String + VALUE_PARAMETER name:d index:0 type:.Derived + VALUE_PARAMETER name:e index:1 type:kotlin.String + VALUE_PARAMETER name:f index:2 type:kotlin.String + BLOCK_BODY + VAR name:a type:kotlin.String [val] + CALL 'public open fun foo (e: kotlin.String): kotlin.String declared in .Derived' type=kotlin.String origin=null + $this: GET_VAR 'd: .Derived declared in .bar' type=.Derived origin=null + e: GET_VAR 'e: kotlin.String declared in .bar' type=kotlin.String origin=null + VAR name:b type:kotlin.String [val] + CALL 'public open fun foo (e: kotlin.String): kotlin.String declared in .Derived' type=kotlin.String origin=null + $this: GET_VAR 'd: .Derived declared in .bar' type=.Derived origin=null + e: GET_VAR 'f: kotlin.String declared in .bar' type=kotlin.String origin=null + RETURN type=kotlin.Nothing from='public final fun bar (d: .Derived, e: kotlin.String, f: kotlin.String): kotlin.String declared in ' + STRING_CONCATENATION type=kotlin.String + GET_VAR 'val a: kotlin.String declared in .bar' type=kotlin.String origin=null + GET_VAR 'val b: kotlin.String declared in .bar' type=kotlin.String origin=null +FILE fqName: fileName:/jvm.kt + CLASS CLASS name:Platform modality:FINAL visibility:public superTypes:[.Derived] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Platform + CONSTRUCTOR visibility:public <> () returnType:.Platform [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in .Derived' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Platform modality:FINAL visibility:public superTypes:[.Derived]' + 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 .Derived + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:.Derived, e:kotlin.String) returnType:kotlin.String [fake_override] + overridden: + public open fun foo (e: kotlin.String): kotlin.String declared in .Derived + $this: VALUE_PARAMETER name: type:.Derived + VALUE_PARAMETER name:e index:0 type:kotlin.String + 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 .Derived + $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 .Derived + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' + CALL 'public final fun bar (d: .Derived, e: kotlin.String, f: kotlin.String): kotlin.String declared in ' type=kotlin.String origin=null + d: CONSTRUCTOR_CALL 'public constructor () declared in .Platform' type=.Platform origin=null + e: CONST String type=kotlin.String value="O" + f: CONST String type=kotlin.String value="K" + TYPEALIAS name:Expect visibility:public expandedType:kotlin.String[actual] diff --git a/compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt b/compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt new file mode 100644 index 00000000000..39c80bb5c80 --- /dev/null +++ b/compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt @@ -0,0 +1,34 @@ +// !LANGUAGE: +MultiPlatformProjects +// IGNORE_BACKEND_K1: ANY +// IGNORE_CODEGEN_WITH_FIR2IR_FAKE_OVERRIDE_GENERATION: JVM_IR +// DUMP_IR + +// MODULE: common +// FILE: common.kt +expect class Expect +interface OtherBase { + fun foo(e: Expect): Expect +} + +interface Base { + fun foo(e: String): String +} +abstract class Derived: Base, OtherBase { + override fun foo(e: Expect) = e +} +fun bar(d: Derived, e : String, f: Expect) : String { + val a = d.foo(e) + val b = d.foo(f) + return "$a$b" +} + +// MODULE: jvm()()(common) +// FILE: jvm.kt + +class Platform : Derived() + +actual typealias Expect = String + +fun box() : String { + return bar(Platform(), "O", "K") +} \ No newline at end of file diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index 4b8b18ffa12..7bf5d91de44 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -27394,6 +27394,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") @TestDataPath("$PROJECT_ROOT") diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java index acccb5257db..6cccd04aa14 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java @@ -27394,6 +27394,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java index bab2dc42b31..cd4256d7459 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java @@ -30465,6 +30465,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java index 9372a194325..27387779f41 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java @@ -31149,6 +31149,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") @TestDataPath("$PROJECT_ROOT") diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java index b68a70f39e4..78c0d4fbc2f 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java @@ -27364,6 +27364,12 @@ public class FirWasmJsCodegenBoxTestGenerated extends AbstractFirWasmJsCodegenBo runTest("compiler/testData/codegen/box/multiplatform/k2/internalOverride2.kt"); } + @Test + @TestMetadata("mergedOverrides.kt") + public void testMergedOverrides() { + runTest("compiler/testData/codegen/box/multiplatform/k2/mergedOverrides.kt"); + } + @Nested @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/annotations") @TestDataPath("$PROJECT_ROOT")