diff --git a/compiler/testData/codegen/box/annotations/jvmAnnotationFlags.kt b/compiler/testData/codegen/box/annotations/jvmAnnotationFlags.kt index ac888608d04..27d1ff0b2de 100644 --- a/compiler/testData/codegen/box/annotations/jvmAnnotationFlags.kt +++ b/compiler/testData/codegen/box/annotations/jvmAnnotationFlags.kt @@ -1,6 +1,5 @@ // TARGET_BACKEND: JVM -// !API_VERSION: 1.9 // WITH_STDLIB // FULL_JDK @@ -13,7 +12,6 @@ class CustomDelegate { class C { @Volatile var vol = 1 - @OptIn(ExperimentalStdlibApi::class) @kotlin.concurrent.Volatile var vol2 = 1 @Transient val tra = 1 @delegate:Transient val del: String by CustomDelegate() diff --git a/compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt b/compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt index 5d09f810367..486748269f4 100644 --- a/compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt +++ b/compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt @@ -1,6 +1,4 @@ -// !API_VERSION: 1.9 @Volatile var vol = 1 -@OptIn(ExperimentalStdlibApi::class) @kotlin.concurrent.Volatile var vol2 = 1 @Transient val tra = 1 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.kt index 4c247506497..8171dbceeb9 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -// !API_VERSION: 1.9 // !LANGUAGE: +MultiPlatformProjects // MODULE: common @@ -9,7 +8,6 @@ import kotlin.concurrent.Volatile import kotlin.properties.Delegates -@OptIn(ExperimentalStdlibApi::class) class ConcurrentVolatile { @Volatile val x = 0 // ok @@ -32,7 +30,6 @@ import kotlin.jvm.Volatile as JvmVolatile import kotlin.concurrent.Volatile import kotlin.properties.Delegates -@OptIn(ExperimentalStdlibApi::class) class ConcurrentVolatileOnJvm { @Volatile val x = 0 // ok diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.txt index 5500f0407c9..8f2df4c4edf 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.txt @@ -1,7 +1,7 @@ // -- Module: -- package -@kotlin.OptIn(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final class ConcurrentVolatile { +public final class ConcurrentVolatile { public constructor ConcurrentVolatile() @field:kotlin.concurrent.Volatile public final var noBacking: kotlin.String @field:kotlin.concurrent.Volatile public final val w: kotlin.Int = 2 @@ -16,7 +16,7 @@ package // -- Module: -- package -@kotlin.OptIn(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final class ConcurrentVolatileOnJvm { +public final class ConcurrentVolatileOnJvm { public constructor ConcurrentVolatileOnJvm() @field:kotlin.concurrent.Volatile /* = kotlin.jvm.Volatile */ public final var noBacking: kotlin.String @field:kotlin.concurrent.Volatile /* = kotlin.jvm.Volatile */ public final val w: kotlin.Int = 2 diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/concurrent/Volatile.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/concurrent/Volatile.kt index 1ee143f70ef..3400c8d7ba4 100644 --- a/kotlin-native/runtime/src/main/kotlin/kotlin/concurrent/Volatile.kt +++ b/kotlin-native/runtime/src/main/kotlin/kotlin/concurrent/Volatile.kt @@ -21,7 +21,7 @@ import kotlin.internal.RequireKotlinVersionKind @Target(AnnotationTarget.FIELD) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented -@SinceKotlin("1.8") +@SinceKotlin("1.9") @RequireKotlin(version = "1.8.20", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) -@ExperimentalStdlibApi +@WasExperimental(ExperimentalStdlibApi::class) public actual annotation class Volatile \ No newline at end of file diff --git a/libraries/stdlib/jvm/src/kotlin/concurrent/Volatile.kt b/libraries/stdlib/jvm/src/kotlin/concurrent/Volatile.kt index 34dbfa3c828..e096f1bc2a4 100644 --- a/libraries/stdlib/jvm/src/kotlin/concurrent/Volatile.kt +++ b/libraries/stdlib/jvm/src/kotlin/concurrent/Volatile.kt @@ -14,7 +14,5 @@ package kotlin.concurrent * For example, if the property getter or setter make several operations with the backing field, * a _property_ operation, i.e. reading or setting it through these accessors, is not guaranteed to be atomic. */ -@Suppress("NEWER_VERSION_IN_SINCE_KOTLIN") @SinceKotlin("1.9") -@ExperimentalStdlibApi public actual typealias Volatile = kotlin.jvm.Volatile \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/concurrent/Volatile.kt b/libraries/stdlib/src/kotlin/concurrent/Volatile.kt index e1f3f115520..de4e22cb472 100644 --- a/libraries/stdlib/src/kotlin/concurrent/Volatile.kt +++ b/libraries/stdlib/src/kotlin/concurrent/Volatile.kt @@ -24,8 +24,6 @@ import kotlin.internal.RequireKotlinVersionKind @Retention(AnnotationRetention.SOURCE) @MustBeDocumented @OptionalExpectation -@Suppress("NEWER_VERSION_IN_SINCE_KOTLIN") @SinceKotlin("1.9") @RequireKotlin(version = "1.8.20", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) -@ExperimentalStdlibApi public expect annotation class Volatile() \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/enums/EnumEntries.kt b/libraries/stdlib/src/kotlin/enums/EnumEntries.kt index 3ca52f73635..641624db66c 100644 --- a/libraries/stdlib/src/kotlin/enums/EnumEntries.kt +++ b/libraries/stdlib/src/kotlin/enums/EnumEntries.kt @@ -7,8 +7,6 @@ package kotlin.enums -import kotlin.jvm.Volatile - /** * A specialized immutable implementation of [List] interface that * contains all enum entries of the specified enum type [E].