KT-74600 Include ExperimentalAtomicApi when serializing builtins

When an annotation class is not resolved, the current builtin compilation pipeline ignores it. For common atomic types it led to ExperimentalAtomicApi being missed on JVM (meaning that users can use experimental atomic types without an explicit opt-in). This change fixes the problem by including the annotation source file during builtin serialization. ^KT-74600 Co-authored-by: vladislavgrecko <[email protected]> Merge-request: KT-MR-19780 Merged-by: Filipp Zhinkin <[email protected]>
zeesh49 · Jan 22, 2025 · 68074a7 · 68074a7
1 parent 1e00112
commit 68074a7
Show file tree

Hide file tree

Showing 26 changed files with 105 additions and 10 deletions.
diff --git a/...decompiled/decompiler-to-psi/testData/builtins/atomics.kotlin_builtins.decompiled.text.kt b/...decompiled/decompiler-to-psi/testData/builtins/atomics.kotlin_builtins.decompiled.text.kt
@@ -3,7 +3,7 @@
 
 package kotlin.concurrent.atomics
 
-@kotlin.SinceKotlin public final class AtomicArray<T> {
+@kotlin.SinceKotlin @kotlin.concurrent.atomics.ExperimentalAtomicApi public final class AtomicArray<T> {
     public constructor(array: kotlin.Array<T>) { /* compiled code */ }
 
     public final val size: kotlin.Int /* compiled code */
@@ -21,7 +21,7 @@ package kotlin.concurrent.atomics
     public open fun toString(): kotlin.String { /* compiled code */ }
 }
 
-@kotlin.SinceKotlin public final class AtomicBoolean public constructor(value: kotlin.Boolean) {
+@kotlin.SinceKotlin @kotlin.concurrent.atomics.ExperimentalAtomicApi public final class AtomicBoolean public constructor(value: kotlin.Boolean) {
     public final fun load(): kotlin.Boolean { /* compiled code */ }
 
     public final fun store(newValue: kotlin.Boolean): kotlin.Unit { /* compiled code */ }
@@ -35,7 +35,7 @@ package kotlin.concurrent.atomics
     public open fun toString(): kotlin.String { /* compiled code */ }
 }
 
-@kotlin.SinceKotlin public final class AtomicInt public constructor(value: kotlin.Int) {
+@kotlin.SinceKotlin @kotlin.concurrent.atomics.ExperimentalAtomicApi public final class AtomicInt public constructor(value: kotlin.Int) {
     public final fun load(): kotlin.Int { /* compiled code */ }
 
     public final fun store(newValue: kotlin.Int): kotlin.Unit { /* compiled code */ }
@@ -53,7 +53,7 @@ package kotlin.concurrent.atomics
     public open fun toString(): kotlin.String { /* compiled code */ }
 }
 
-@kotlin.SinceKotlin public final class AtomicIntArray {
+@kotlin.SinceKotlin @kotlin.concurrent.atomics.ExperimentalAtomicApi public final class AtomicIntArray {
     public constructor(size: kotlin.Int) { /* compiled code */ }
 
     public constructor(array: kotlin.IntArray) { /* compiled code */ }
@@ -78,7 +78,7 @@ package kotlin.concurrent.atomics
     public open fun toString(): kotlin.String { /* compiled code */ }
 }
 
-@kotlin.SinceKotlin public final class AtomicLong public constructor(value: kotlin.Long) {
+@kotlin.SinceKotlin @kotlin.concurrent.atomics.ExperimentalAtomicApi public final class AtomicLong public constructor(value: kotlin.Long) {
     public final fun load(): kotlin.Long { /* compiled code */ }
 
     public final fun store(newValue: kotlin.Long): kotlin.Unit { /* compiled code */ }
@@ -96,7 +96,7 @@ package kotlin.concurrent.atomics
     public open fun toString(): kotlin.String { /* compiled code */ }
 }
 
-@kotlin.SinceKotlin public final class AtomicLongArray {
+@kotlin.SinceKotlin @kotlin.concurrent.atomics.ExperimentalAtomicApi public final class AtomicLongArray {
     public constructor(size: kotlin.Int) { /* compiled code */ }
 
     public constructor(array: kotlin.LongArray) { /* compiled code */ }
@@ -121,7 +121,7 @@ package kotlin.concurrent.atomics
     public open fun toString(): kotlin.String { /* compiled code */ }
 }
 
-@kotlin.SinceKotlin public final class AtomicReference<T> public constructor(value: T) {
+@kotlin.SinceKotlin @kotlin.concurrent.atomics.ExperimentalAtomicApi public final class AtomicReference<T> public constructor(value: T) {
     public final fun load(): T { /* compiled code */ }
 
     public final fun store(newValue: T): kotlin.Unit { /* compiled code */ }

diff --git a/.../fir/analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/KJKHierarchy.fir.txt b/.../fir/analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/KJKHierarchy.fir.txt
@@ -1,4 +1,5 @@
 FILE: KotlinClass.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/concurrent/atomics/ExperimentalAtomicApi|)))
     public open class KotlinClass : R|kotlin/Any| {
         public constructor(): R|KotlinClass| {
             super<R|kotlin/Any|>()
@@ -12,6 +13,7 @@ FILE: KotlinClass.kt
 
     }
 FILE: test.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/concurrent/atomics/ExperimentalAtomicApi|)))
     public final class KotlinChildWithFakeOverride : R|JavaClassWithFakeOverride| {
         public constructor(): R|KotlinChildWithFakeOverride| {
             super<R|JavaClassWithFakeOverride|>()

diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/KJKHierarchy.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/KJKHierarchy.kt
@@ -3,6 +3,9 @@
 // WITH_STDLIB
 
 // FILE: KotlinClass.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicInt
 
 open class KotlinClass {
@@ -15,6 +18,9 @@ open class KotlinClass {
 public class JavaClassWithFakeOverride extends KotlinClass {}
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaClassWithFakeOverride
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.atomics.AtomicInt

diff --git a/...ysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/javaToKotlinHierarchy.fir.txt b/...ysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/javaToKotlinHierarchy.fir.txt
@@ -1,4 +1,5 @@
 FILE: test.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/concurrent/atomics/ExperimentalAtomicApi|)))
     public final class KotlinClassWithFakeOverride : R|JavaClass| {
         public constructor(): R|KotlinClassWithFakeOverride| {
             super<R|JavaClass|>()

diff --git a/.../analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/javaToKotlinHierarchy.kt b/.../analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/javaToKotlinHierarchy.kt
@@ -11,6 +11,9 @@ public class JavaClass {
 }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaClass
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.atomics.AtomicInt

diff --git a/...ysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/kotlinToJavaHierarchy.fir.txt b/...ysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/kotlinToJavaHierarchy.fir.txt
@@ -1,4 +1,5 @@
 FILE: KotlinClass.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/concurrent/atomics/ExperimentalAtomicApi|)))
     public open class KotlinClass : R|kotlin/Any| {
         public constructor(): R|KotlinClass| {
             super<R|kotlin/Any|>()
@@ -12,6 +13,7 @@ FILE: KotlinClass.kt
 
     }
 FILE: test.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/concurrent/atomics/ExperimentalAtomicApi|)))
     public final fun usage(x: R|JavaClassWithFakeOverride|): R|kotlin/Unit| {
         R|<local>/x|.R|/KotlinClass.foo|(R|kotlin/concurrent/atomics/AtomicInt.AtomicInt|(Int(0)))
         R|<local>/x|.R|/KotlinClass.foo<Inapplicable(INAPPLICABLE): /KotlinClass.foo>#|(R|java/util/concurrent/atomic/AtomicInteger.AtomicInteger|(Int(0)))

diff --git a/.../analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/kotlinToJavaHierarchy.kt b/.../analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/kotlinToJavaHierarchy.kt
@@ -3,6 +3,9 @@
 // WITH_STDLIB
 
 // FILE: KotlinClass.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicInt
 
 open class KotlinClass {
@@ -15,6 +18,9 @@ open class KotlinClass {
 public class JavaClassWithFakeOverride extends KotlinClass { }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaClassWithFakeOverride
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.atomics.AtomicInt

diff --git a/...alysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/overrideWithRawType.fir.txt b/...alysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/overrideWithRawType.fir.txt
@@ -1,4 +1,5 @@
 FILE: KotlinClass.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/concurrent/atomics/ExperimentalAtomicApi|)))
     public open class KotlinClass : R|kotlin/Any| {
         public constructor(): R|KotlinClass| {
             super<R|kotlin/Any|>()
@@ -9,6 +10,7 @@ FILE: KotlinClass.kt
 
     }
 FILE: test.kt
+    @FILE:R|kotlin/OptIn|(markerClass = vararg(<getClass>(Q|kotlin/concurrent/atomics/ExperimentalAtomicApi|)))
     public final fun usage(a: R|JavaClass|): R|kotlin/Unit| {
         R|<local>/a|.R|/JavaClass.foo|(Q|java/util/concurrent/atomic|.R|java/util/concurrent/atomic/AtomicReference.AtomicReference|<R|kotlin/String!|>(String()))
         R|<local>/a|.R|/JavaClass.foo<Inapplicable(INAPPLICABLE): /JavaClass.foo>#|(R|kotlin/concurrent/atomics/AtomicReference.AtomicReference|<R|kotlin/Int|>(Int(1)))

diff --git a/...ir/analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/overrideWithRawType.kt b/...ir/analysis-tests/testData/resolveWithStdlib/j+k/commonAtomicTypes/overrideWithRawType.kt
@@ -3,6 +3,9 @@
 // WITH_STDLIB
 
 // FILE: KotlinClass.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 open class KotlinClass {
@@ -18,6 +21,9 @@ public class JavaClass extends KotlinClass {
 }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun usage(a: JavaClass) {

diff --git a/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/IntersectionKotlinJavaAtomics.kt b/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/IntersectionKotlinJavaAtomics.kt
@@ -2,6 +2,9 @@
 // WITH_STDLIB
 
 // FILE: KotlinInterface.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicInt
 
 interface KotlinInterface {
@@ -47,6 +50,9 @@ public class JavaIntersectionWithExplicitOverride extends JavaClass implements K
 }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaClass
 import kotlin.concurrent.atomics.AtomicInt
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/KJKHierarchy.kt b/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/KJKHierarchy.kt
@@ -2,6 +2,9 @@
 // WITH_STDLIB
 
 // FILE: KotlinClass.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicInt
 
 open class KotlinClass {
@@ -16,6 +19,9 @@ open class KotlinClass {
 public class JavaClassWithFakeOverride extends KotlinClass {}
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaClassWithFakeOverride
 import kotlin.concurrent.atomics.*
 

diff --git a/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/addedOverloadWithAtomics.kt b/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/addedOverloadWithAtomics.kt
@@ -11,6 +11,9 @@ public class JavaBase {
 }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicInt
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/kotlinToJavaHierarchy.kt b/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/kotlinToJavaHierarchy.kt
@@ -2,6 +2,9 @@
 // WITH_STDLIB
 
 // FILE: KotlinClass.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicInt
 
 open class KotlinClass {
@@ -28,6 +31,9 @@ public class JavaClassWithExplicitOverride extends KotlinClass {
 }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaClassWithExplicitOverride
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.atomics.AtomicInt

diff --git a/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/overloadsWithAtomics.kt b/compiler/testData/codegen/box/javaInterop/commonAtomicTypes/overloadsWithAtomics.kt
@@ -5,6 +5,9 @@
 public class JavaOverloadsChild extends OverloadsWithAtomicIntAndInteger { }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaOverloadsChild
 import kotlin.concurrent.atomics.AtomicInt
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/...Data/codegen/box/javaInterop/commonAtomicTypes/usingJavaAtomicWhenKotlinAtomicExpected.kt b/...Data/codegen/box/javaInterop/commonAtomicTypes/usingJavaAtomicWhenKotlinAtomicExpected.kt
@@ -10,6 +10,9 @@ public class JavaClass {
 }
 
 // FILE: test.kt
+
+@file:OptIn(ExperimentalAtomicApi::class)
+
 import JavaClass
 import kotlin.concurrent.atomics.asKotlinAtomic
 import kotlin.concurrent.atomics.asKotlinAtomicArray
@@ -26,7 +29,6 @@ class KotlinClass {
     }
 }
 
-@OptIn(ExperimentalAtomicApi::class)
 fun usage(a: KotlinClass): String {
     return a.foo(JavaClass().a.asKotlinAtomic())+ a.bar(JavaClass().b.asKotlinAtomicArray())
 }

diff --git a/compiler/testData/diagnostics/tests/errorProneAtomicReferencePrimitives.fir.kt b/compiler/testData/diagnostics/tests/errorProneAtomicReferencePrimitives.fir.kt
@@ -29,6 +29,8 @@ fun testTypealiasedJava() {
 
 // FILE: K.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun testKotlin() {

diff --git a/compiler/testData/diagnostics/tests/errorProneAtomicReferencePrimitives.kt b/compiler/testData/diagnostics/tests/errorProneAtomicReferencePrimitives.kt
@@ -29,6 +29,8 @@ fun testTypealiasedJava() {
 
 // FILE: K.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun testKotlin() {

diff --git a/.../testData/diagnostics/tests/multiplatform/errorProneAtomicReferencePrimitivesInKMP.fir.kt b/.../testData/diagnostics/tests/multiplatform/errorProneAtomicReferencePrimitivesInKMP.fir.kt
@@ -6,6 +6,8 @@
 // MODULE: common
 // FILE: C.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun commonTestKotlin() {
@@ -33,6 +35,8 @@ fun commonTypealiasedKotlin() {
 // MODULE: jvm()()(common)
 // FILE: K.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun testKotlin() {

diff --git a/...iler/testData/diagnostics/tests/multiplatform/errorProneAtomicReferencePrimitivesInKMP.kt b/...iler/testData/diagnostics/tests/multiplatform/errorProneAtomicReferencePrimitivesInKMP.kt
@@ -6,6 +6,8 @@
 // MODULE: common
 // FILE: C.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun commonTestKotlin() {
@@ -33,6 +35,8 @@ fun commonTypealiasedKotlin() {
 // MODULE: jvm()()(common)
 // FILE: K.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun testKotlin() {

diff --git a/...r/testData/diagnostics/tests/multiplatform/errorProneAtomicReferencePrimitivesInKMP.ll.kt b/...r/testData/diagnostics/tests/multiplatform/errorProneAtomicReferencePrimitivesInKMP.ll.kt
@@ -6,6 +6,8 @@
 // MODULE: common
 // FILE: C.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun commonTestKotlin() {
@@ -33,6 +35,8 @@ fun commonTypealiasedKotlin() {
 // MODULE: jvm()()(common)
 // FILE: K.kt
 
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicReference
 
 fun testKotlin() {

diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/atomicTypes.kt b/compiler/testData/diagnostics/tests/multiplatform/java/atomicTypes.kt
@@ -5,9 +5,9 @@
 // MODULE: m1-common
 // FILE: common.kt
 import kotlin.concurrent.atomics.AtomicInt
-import kotlin.concurrent.atomics.<!UNRESOLVED_REFERENCE!>ExperimentalAtomicApi<!>
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
 
-<!OPT_IN_WITHOUT_ARGUMENTS!>@OptIn(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!><!UNRESOLVED_REFERENCE!>ExperimentalAtomicApi<!>::class<!>)<!>
+@OptIn(ExperimentalAtomicApi::class)
 expect class Foo {
     fun test(a: AtomicInt): AtomicInt
 }

diff --git a/...agnostics/testsWithJvmBackend/duplicateJvmSignature/commonAtomicTypes/KJKHierarchy.fir.kt b/...agnostics/testsWithJvmBackend/duplicateJvmSignature/commonAtomicTypes/KJKHierarchy.fir.kt
@@ -1,6 +1,9 @@
 // WITH_STDLIB
 
 // FILE: KotlinClass.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import kotlin.concurrent.atomics.AtomicInt
 
 open class KotlinClass {
@@ -22,6 +25,9 @@ public class JavaClassWithExplicitOverride extends KotlinClass {
 }
 
 // FILE: test.kt
+
+@file:OptIn(kotlin.concurrent.atomics.ExperimentalAtomicApi::class)
+
 import JavaClassWithExplicitOverride
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.atomics.AtomicInt