azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Consider @PlatformDependent annotation everywhere (including JS and Native)

Browse Source 
^KT-57858 Fixed

Remove FirEmptyOverridesBackwardCompatibilityHelper since it's not used anymore

Remove overridesMemberWithPlatformDependent.kt test file since it becomes redundant
This commit is contained in:
Ivan Kochurkin
2023-09-15 14:47:15 +02:00
committed by Space Team
parent 1026cdf035
commit 3cd4f7c3aa
27 changed files with 110 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirEmptyOverridesBackwardCompatibilityHelper.kt
-13
View File
@@ -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<FirCallableSymbol<*>>, context: CheckerContext): Boolean = false
}
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactoryHelper.kt
+2 -2
View File
@@ -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)
}
}
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -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 {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -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 {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -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 {
compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.kt → compiler/testData/codegen/box/annotations/platformDependent.kt
Vendored
+7 -2
View File
@@ -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 <!VIRTUAL_MEMBER_HIDDEN!>f<!>() {}
fun f() = "OK"
}
fun box() = C().f()
compiler/testData/diagnostics/nativeTests/overridesMemberWithPlatformDependent.fir.kt
Vendored
-21
View File
@@ -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", <!ERROR_SUPPRESSION!>"INVISIBLE_REFERENCE"<!>)
import kotlin.internal.PlatformDependent
interface I {
@PlatformDependent
fun f() {}
}
class C : I {
fun <!VIRTUAL_MEMBER_HIDDEN!>f<!>() {}
}
compiler/testData/diagnostics/testsWithJsStdLib/overridesMemberWithPlatformDependent.kt
Vendored
-14
View File
@@ -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 <!VIRTUAL_MEMBER_HIDDEN!>f<!>() {}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -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 {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -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 {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -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 {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -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");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsOldFrontendDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/DiagnosticsWithJsStdLibTestGenerated.java
Generated
-6
View File
@@ -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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -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 {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -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 {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java
Generated
-6
View File
@@ -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 {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -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 {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -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 {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -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 {