diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirEmptyOverridesBackwardCompatibilityHelper.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirEmptyOverridesBackwardCompatibilityHelper.kt deleted file mode 100644 index 0ed24ec07c4..00000000000 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirEmptyOverridesBackwardCompatibilityHelper.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.fir.analysis - -import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext -import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol - -object FirEmptyOverridesBackwardCompatibilityHelper : FirOverridesBackwardCompatibilityHelper() { - override fun overrideCanBeOmitted(overriddenMemberSymbols: List>, context: CheckerContext): Boolean = false -} \ No newline at end of file diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactoryHelper.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactoryHelper.kt index d6a384bf1e0..7205d7039fc 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactoryHelper.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactoryHelper.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.session import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.fir.* -import org.jetbrains.kotlin.fir.analysis.FirEmptyOverridesBackwardCompatibilityHelper +import org.jetbrains.kotlin.fir.analysis.FirDefaultOverridesBackwardCompatibilityHelper import org.jetbrains.kotlin.fir.analysis.FirOverridesBackwardCompatibilityHelper import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar import org.jetbrains.kotlin.fir.extensions.FirExtensionService @@ -137,6 +137,6 @@ object FirSessionFactoryHelper { register(FirVisibilityChecker::class, FirVisibilityChecker.Default) register(ConeCallConflictResolverFactory::class, DefaultCallConflictResolverFactory) register(FirPlatformClassMapper::class, FirPlatformClassMapper.Default) - register(FirOverridesBackwardCompatibilityHelper::class, FirEmptyOverridesBackwardCompatibilityHelper) + register(FirOverridesBackwardCompatibilityHelper::class, FirDefaultOverridesBackwardCompatibilityHelper) } } 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 2dec567c877..fab5a61ae2c 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 @@ -353,6 +353,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/annotations/parameters.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java index 5dcea5be1aa..9c3b568b296 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java @@ -353,6 +353,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated runTest("compiler/testData/codegen/box/annotations/parameters.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { 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 7c11533d8c4..4662a7b30b9 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 @@ -353,6 +353,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/annotations/parameters.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { diff --git a/compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.kt b/compiler/testData/codegen/box/annotations/platformDependent.kt similarity index 70% rename from compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.kt rename to compiler/testData/codegen/box/annotations/platformDependent.kt index b4dedda759f..50ff008cd38 100644 --- a/compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.kt +++ b/compiler/testData/codegen/box/annotations/platformDependent.kt @@ -1,21 +1,26 @@ +// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM, NATIVE // ISSUE: KT-57858 // FILE: Sub.kt + package kotlin.internal @Target(AnnotationTarget.FUNCTION) annotation class PlatformDependent // FILE: Main.kt + @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") import kotlin.internal.PlatformDependent interface I { @PlatformDependent - fun f() {} + fun f(): String = "FAIL" } class C : I { - fun f() {} + fun f() = "OK" } + +fun box() = C().f() \ No newline at end of file diff --git a/compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.fir.kt b/compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.fir.kt deleted file mode 100644 index cf459dadbc6..00000000000 --- a/compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.fir.kt +++ /dev/null @@ -1,21 +0,0 @@ -// ISSUE: KT-57858 - -// FILE: Sub.kt -package kotlin.internal - -@Target(AnnotationTarget.FUNCTION) -annotation class PlatformDependent - -// FILE: Main.kt -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") - -import kotlin.internal.PlatformDependent - -interface I { - @PlatformDependent - fun f() {} -} - -class C : I { - fun f() {} -} diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/overridesMemberWithPlatformDependent.kt b/compiler/testData/diagnostics/testsWithJsStdLib/overridesMemberWithPlatformDependent.kt deleted file mode 100644 index 8026a6e3e97..00000000000 --- a/compiler/testData/diagnostics/testsWithJsStdLib/overridesMemberWithPlatformDependent.kt +++ /dev/null @@ -1,14 +0,0 @@ -// FIR_IDENTICAL -// ISSUE: KT-57858 -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") - -import kotlin.internal.PlatformDependent - -interface I { - @PlatformDependent - fun f() {} -} - -class C : I { - fun f() {} -} \ No newline at end of file diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index d990f23c017..154255d414c 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -305,6 +305,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/annotations/parameters.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index decbff3481b..fd318ffef8f 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 @@ -353,6 +353,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/annotations/parameters.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { 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 a047c665b9a..17b0aedfec1 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 @@ -353,6 +353,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/annotations/parameters.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index e40f65a5142..a1de396d866 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -308,6 +308,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/annotations/parameters.kt"); } + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { runTest("compiler/testData/codegen/box/annotations/propertyWithPropertyInInitializerAsParameter.kt"); 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 29ea1dce08b..9abdf9e04d6 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 @@ -59,6 +59,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { 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 7fdb9e51a60..f5252a3779e 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 @@ -59,6 +59,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java index d81623d211b..4692054a0f6 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java @@ -79,12 +79,6 @@ public class FirPsiJsOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiJ runTest("compiler/testData/diagnostics/testsWithJsStdLib/noImpl.kt"); } - @Test - @TestMetadata("overridesMemberWithPlatformDependent.kt") - public void testOverridesMemberWithPlatformDependent() throws Exception { - runTest("compiler/testData/diagnostics/testsWithJsStdLib/overridesMemberWithPlatformDependent.kt"); - } - @Test @TestMetadata("platformDependent.kt") public void testPlatformDependent() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/DiagnosticsWithJsStdLibTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/DiagnosticsWithJsStdLibTestGenerated.java index 86a6a8aefea..8e349e27336 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/DiagnosticsWithJsStdLibTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/DiagnosticsWithJsStdLibTestGenerated.java @@ -79,12 +79,6 @@ public class DiagnosticsWithJsStdLibTestGenerated extends AbstractDiagnosticsTes runTest("compiler/testData/diagnostics/testsWithJsStdLib/noImpl.kt"); } - @Test - @TestMetadata("overridesMemberWithPlatformDependent.kt") - public void testOverridesMemberWithPlatformDependent() throws Exception { - runTest("compiler/testData/diagnostics/testsWithJsStdLib/overridesMemberWithPlatformDependent.kt"); - } - @Test @TestMetadata("platformDependent.kt") public void testPlatformDependent() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index 232c11c7e5f..60d7043c1b1 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -59,6 +59,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index eec0d3e3397..d7ea39fad5d 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -59,6 +59,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index 8b5a4c89c73..d1ccaf8a87d 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -70,6 +70,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java index 239c5760570..6625ab8e1b4 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java @@ -76,6 +76,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index eba4906929c..cf94950b91a 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -68,6 +68,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java index ff631ee5873..c5d429326c1 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java @@ -71,6 +71,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java index db4f0140e69..9f92a30af5e 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java @@ -72,12 +72,6 @@ public class DiagnosticsNativeTestGenerated extends AbstractDiagnosticsNativeTes runTest("compiler/testData/diagnostics/nativeTests/objCRefinement.kt"); } - @Test - @TestMetadata("overridesMemberWithPlatformDependent.kt") - public void testOverridesMemberWithPlatformDependent() throws Exception { - runTest("compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.kt"); - } - @Test @TestMetadata("sharedImmutable.kt") public void testSharedImmutable() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java index de374c14454..df20883cd28 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java @@ -76,12 +76,6 @@ public class FirLightTreeOldFrontendNativeDiagnosticsTestGenerated extends Abstr runTest("compiler/testData/diagnostics/nativeTests/objCRefinement.kt"); } - @Test - @TestMetadata("overridesMemberWithPlatformDependent.kt") - public void testOverridesMemberWithPlatformDependent() throws Exception { - runTest("compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.kt"); - } - @Test @TestMetadata("sharedImmutable.kt") public void testSharedImmutable() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java index 2057f860ef1..41360728323 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java @@ -76,12 +76,6 @@ public class FirPsiOldFrontendNativeDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/nativeTests/objCRefinement.kt"); } - @Test - @TestMetadata("overridesMemberWithPlatformDependent.kt") - public void testOverridesMemberWithPlatformDependent() throws Exception { - runTest("compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.kt"); - } - @Test @TestMetadata("sharedImmutable.kt") public void testSharedImmutable() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java index aece73e69e8..dca7fb3e258 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java @@ -59,6 +59,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java index 8b7583720de..b3962955bc5 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java @@ -59,6 +59,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest runTest("compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt"); } + @Test + @TestMetadata("platformDependent.kt") + public void testPlatformDependent() throws Exception { + runTest("compiler/testData/codegen/box/annotations/platformDependent.kt"); + } + @Test @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception {