From d6a78dd766fc8fce8de75b1864983e86f7ff48a3 Mon Sep 17 00:00:00 2001
From: Anastasia Pikalova <anastasia.nekrasova@jetbrains.com>
Date: Tue, 17 Sep 2024 16:18:58 +0200
Subject: [PATCH] Remove @ExperimentalSubclassOptIn from SubclassOptInRequired

Tests are updated.

^KT-71222 Fixed
---
 .../testData/lazyResolveBuiltinsBinary/Int.txt      |  2 +-
 .../fir/analysis-tests/testData/builtIns/kotlin.txt |  2 +-
 .../ClassIdDiagnosticRendering.fir.txt              |  1 -
 .../resolveWithStdlib/ClassIdDiagnosticRendering.kt |  1 -
 .../testData/builtin-classes/default/kotlin.txt     |  2 +-
 compiler/testData/builtin-classes/java8/kotlin.txt  |  2 +-
 .../testData/builtin-classes/newMethods/kotlin.txt  |  2 +-
 .../subclassOptInRequired/CorrectApplicability.kt   |  1 -
 .../DiagnosticDefaultMessage.fir.kt                 |  1 -
 .../DiagnosticDefaultMessage.kt                     |  1 -
 .../subclassOptInRequired/Experimentality.fir.kt    | 13 +++++++++++++
 .../subclassOptInRequired/Experimentality.kt        | 12 +++++++++---
 .../subclassOptInRequired/IncorrectApplicability.kt |  1 -
 .../InheritingByLocalClassifiers.kt                 |  1 -
 .../InheritingDifferentOptInLevels.kt               |  1 -
 .../subclassOptInRequired/InnerAndNestedClasses.kt  |  1 -
 .../subclassOptInRequired/InnerClasses.kt           |  1 -
 .../annotations/subclassOptInRequired/Module.kt     |  1 -
 .../subclassOptInRequired/NestedClasses.kt          |  1 -
 .../NotApiMarkerAsArgument.fir.kt                   |  2 --
 .../subclassOptInRequired/NotApiMarkerAsArgument.kt |  2 --
 .../subclassOptInRequired/UsageOptInIsNotImplied.kt |  2 --
 .../subclassOptInRequired/WithAbstractClasses.kt    |  2 --
 .../WithInheritanceByDelegation.kt                  |  1 -
 .../subclassOptInRequired/WithInterfaces.kt         |  2 --
 .../subclassOptInRequired/WithOpenClasses.kt        |  2 --
 26 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.fir.kt

diff --git a/analysis/low-level-api-fir/testData/lazyResolveBuiltinsBinary/Int.txt b/analysis/low-level-api-fir/testData/lazyResolveBuiltinsBinary/Int.txt
index e6bf44f5a315f..07f11f9122c0a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveBuiltinsBinary/Int.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveBuiltinsBinary/Int.txt
@@ -3842,7 +3842,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] kotlin.kotlin_builtins
         }
 
     }
-    @R|kotlin/annotation/Target|[Types]() @R|kotlin/annotation/Retention|[Types]() @R|kotlin/SinceKotlin|[Types]() @R|kotlin/ExperimentalSubclassOptIn|[Types]() public final [ResolvedTo(BODY_RESOLVE)] annotation class SubclassOptInRequired : R|kotlin/Annotation|, R|kotlin/Annotation| {
+    @R|kotlin/annotation/Target|[Types]() @R|kotlin/annotation/Retention|[Types]() @R|kotlin/SinceKotlin|[Types]() @R|kotlin/WasExperimental|[Types]() public final [ResolvedTo(BODY_RESOLVE)] annotation class SubclassOptInRequired : R|kotlin/Annotation|, R|kotlin/Annotation| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=SubclassOptInRequired] constructor([ResolvedTo(BODY_RESOLVE)] markerClass: R|kotlin/reflect/KClass<out kotlin/Annotation>|): R|kotlin/SubclassOptInRequired| {
             super<R|kotlin/Any|>()
         }
diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt
index 8c5854c92e7de..f05348e087408 100644
--- a/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt
+++ b/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt
@@ -1369,7 +1369,7 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
 }
 
-@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(kotlin/annotation/AnnotationTarget.CLASS)) @R|kotlin/annotation/Retention|(value = kotlin/annotation/AnnotationRetention.BINARY) @R|kotlin/SinceKotlin|(version = String(1.8)) @R|kotlin/ExperimentalSubclassOptIn|() public final annotation class SubclassOptInRequired : R|kotlin/Annotation| {
+@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(kotlin/annotation/AnnotationTarget.CLASS)) @R|kotlin/annotation/Retention|(value = kotlin/annotation/AnnotationRetention.BINARY) @R|kotlin/SinceKotlin|(version = String(2.1)) @R|kotlin/WasExperimental|(markerClass = <implicitArrayOf>(<getClass>(<getClass>(R|kotlin/ExperimentalSubclassOptIn|)))) public final annotation class SubclassOptInRequired : R|kotlin/Annotation| {
     public final val markerClass: R|kotlin/reflect/KClass<out kotlin/Annotation>|
         public get(): R|kotlin/reflect/KClass<out kotlin/Annotation>|
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.fir.txt
index 1272f9864f724..b47c3a1bf6d89 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.fir.txt
@@ -1,5 +1,4 @@
 FILE: ClassIdDiagnosticRendering.kt
-    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/ExperimentalSubclassOptIn|)))
     package a.b.c
 
     @R|kotlin/RequiresOptIn|() public final annotation class Marker : R|kotlin/Annotation| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.kt
index 524c8386fc12c..edc93f2e222f1 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/ClassIdDiagnosticRendering.kt
@@ -1,5 +1,4 @@
 // WITH_EXTRA_CHECKERS
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 package a.b.c
 
diff --git a/compiler/testData/builtin-classes/default/kotlin.txt b/compiler/testData/builtin-classes/default/kotlin.txt
index f88401d46795b..db9d010ed4d08 100644
--- a/compiler/testData/builtin-classes/default/kotlin.txt
+++ b/compiler/testData/builtin-classes/default/kotlin.txt
@@ -781,7 +781,7 @@ public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequenc
     }
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.ExperimentalSubclassOptIn public final annotation class SubclassOptInRequired : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "2.1") @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalSubclassOptIn::class}) public final annotation class SubclassOptInRequired : kotlin.Annotation {
     /*primary*/ public constructor SubclassOptInRequired(/*0*/ markerClass: kotlin.reflect.KClass<out kotlin.Annotation>)
     public final val markerClass: kotlin.reflect.KClass<out kotlin.Annotation>
         public final fun `<get-markerClass>`(): kotlin.reflect.KClass<out kotlin.Annotation>
diff --git a/compiler/testData/builtin-classes/java8/kotlin.txt b/compiler/testData/builtin-classes/java8/kotlin.txt
index 860c677c72d34..24b2ed419557b 100644
--- a/compiler/testData/builtin-classes/java8/kotlin.txt
+++ b/compiler/testData/builtin-classes/java8/kotlin.txt
@@ -808,7 +808,7 @@ public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequenc
     }
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.ExperimentalSubclassOptIn public final annotation class SubclassOptInRequired : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "2.1") @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalSubclassOptIn::class}) public final annotation class SubclassOptInRequired : kotlin.Annotation {
     /*primary*/ public constructor SubclassOptInRequired(/*0*/ markerClass: kotlin.reflect.KClass<out kotlin.Annotation>)
     public final val markerClass: kotlin.reflect.KClass<out kotlin.Annotation>
         public final fun `<get-markerClass>`(): kotlin.reflect.KClass<out kotlin.Annotation>
diff --git a/compiler/testData/builtin-classes/newMethods/kotlin.txt b/compiler/testData/builtin-classes/newMethods/kotlin.txt
index 76974fbc7ac87..2da48d65da013 100644
--- a/compiler/testData/builtin-classes/newMethods/kotlin.txt
+++ b/compiler/testData/builtin-classes/newMethods/kotlin.txt
@@ -807,7 +807,7 @@ public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequenc
     }
 }
 
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.8") @kotlin.ExperimentalSubclassOptIn public final annotation class SubclassOptInRequired : kotlin.Annotation {
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "2.1") @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalSubclassOptIn::class}) public final annotation class SubclassOptInRequired : kotlin.Annotation {
     /*primary*/ public constructor SubclassOptInRequired(/*0*/ markerClass: kotlin.reflect.KClass<out kotlin.Annotation>)
     public final val markerClass: kotlin.reflect.KClass<out kotlin.Annotation>
         public final fun `<get-markerClass>`(): kotlin.reflect.KClass<out kotlin.Annotation>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/CorrectApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/CorrectApplicability.kt
index 8927d37864fdb..dabef7f38e862 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/CorrectApplicability.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/CorrectApplicability.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.fir.kt
index 7aadd5c192fcd..1992dfba401b7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.fir.kt
@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalSubclassOptIn::class)
 @RequiresOptIn
 annotation class ApiMarker
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.kt
index d9100424f8fb6..6e54c755397ce 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/DiagnosticDefaultMessage.kt
@@ -1,4 +1,3 @@
-@file:OptIn(ExperimentalSubclassOptIn::class)
 @RequiresOptIn
 annotation class ApiMarker
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.fir.kt
new file mode 100644
index 0000000000000..e64a49a1be915
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.fir.kt
@@ -0,0 +1,13 @@
+// ALLOW_DANGEROUS_LANGUAGE_VERSION_TESTING
+// LANGUAGE_VERSION: 2.0
+// API_VERSION: 2.0
+
+@RequiresOptIn
+annotation class ApiMarker
+
+@<!OPT_IN_USAGE_ERROR!>SubclassOptInRequired<!>(ApiMarker::class)
+open class OpenKlassA
+
+@OptIn(ExperimentalSubclassOptIn::class)
+@SubclassOptInRequired(ApiMarker::class)
+open class OpenKlassB
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.kt
index a20de3f196d73..f646b4c0e5021 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Experimentality.kt
@@ -1,7 +1,13 @@
-// FIR_IDENTICAL
+// ALLOW_DANGEROUS_LANGUAGE_VERSION_TESTING
+// LANGUAGE_VERSION: 2.0
+// API_VERSION: 2.0
 
 @RequiresOptIn
 annotation class ApiMarker
 
-@<!OPT_IN_USAGE_ERROR!>SubclassOptInRequired<!>(ApiMarker::class)
-open class OpenKlass
+@<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, OPT_IN_USAGE_ERROR, UNRESOLVED_REFERENCE!>SubclassOptInRequired<!>(ApiMarker::class)
+open class OpenKlassA
+
+@OptIn(ExperimentalSubclassOptIn::class)
+@SubclassOptInRequired(ApiMarker::class)
+open class OpenKlassB
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/IncorrectApplicability.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/IncorrectApplicability.kt
index 6a1f0dd2e9d53..e55f3eae4ceca 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/IncorrectApplicability.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/IncorrectApplicability.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingByLocalClassifiers.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingByLocalClassifiers.kt
index 52b314eab571f..8a2c263dd15fc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingByLocalClassifiers.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingByLocalClassifiers.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingDifferentOptInLevels.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingDifferentOptInLevels.kt
index 2249d70cc37bc..8a702d5e6ed23 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingDifferentOptInLevels.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InheritingDifferentOptInLevels.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerAndNestedClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerAndNestedClasses.kt
index 1de9bf1104d8a..b96e7a4873f8f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerAndNestedClasses.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerAndNestedClasses.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class Api
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerClasses.kt
index e8473223131ce..c8e2cb367f5b6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerClasses.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/InnerClasses.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class Boom
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Module.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Module.kt
index 3c3848e6914df..529761c6fade7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Module.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Module.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // MODULE: a
-@file:OptIn(ExperimentalSubclassOptIn::class)
 package a
 
 @RequiresOptIn
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NestedClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NestedClasses.kt
index 6feb556035443..edafc6da6b95e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NestedClasses.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NestedClasses.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class Boom
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.fir.kt
index b899637a59dc1..47852e477d834 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.fir.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalSubclassOptIn::class)
-
 annotation class DummyAnnotation
 
 <!SUBCLASS_OPT_ARGUMENT_IS_NOT_MARKER!>@SubclassOptInRequired(DummyAnnotation::class)<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt
index 9d0cc4b156fb6..9bbe0b6b8fb5d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalSubclassOptIn::class)
-
 annotation class DummyAnnotation
 
 <!OPT_IN_ARGUMENT_IS_NOT_MARKER!>@SubclassOptInRequired(DummyAnnotation::class)<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/UsageOptInIsNotImplied.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/UsageOptInIsNotImplied.kt
index 921e7ccc5b31c..13fe97ae84ef2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/UsageOptInIsNotImplied.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/UsageOptInIsNotImplied.kt
@@ -1,6 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
-
 @RequiresOptIn
 annotation class ApiMarker
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithAbstractClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithAbstractClasses.kt
index 59d9ec684975d..4dd16428240c3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithAbstractClasses.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithAbstractClasses.kt
@@ -1,6 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
-
 @RequiresOptIn
 annotation class ApiMarker
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInheritanceByDelegation.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInheritanceByDelegation.kt
index 2718385f2d4a2..b647f92dcec28 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInheritanceByDelegation.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInheritanceByDelegation.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
 
 @RequiresOptIn
 annotation class ApiMarker
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInterfaces.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInterfaces.kt
index 8e52ae56a53bd..99cb09531862a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInterfaces.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithInterfaces.kt
@@ -1,6 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
-
 @RequiresOptIn
 annotation class ApiMarker
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithOpenClasses.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithOpenClasses.kt
index 32c799248ad43..08128c59a8251 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithOpenClasses.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/WithOpenClasses.kt
@@ -1,6 +1,4 @@
 // FIR_IDENTICAL
-@file:OptIn(ExperimentalSubclassOptIn::class)
-
 @RequiresOptIn
 annotation class ApiMarker