Skip to content

Commit 9953991

Browse files
ilya-gSpace Team
authored and
Space Team
committed
Include WasExperimental into builtins serialization
It is required for stabilizing previously experimental builtin functions and classes (KT-53778) in order to mark them WasExperimental, so that they are available for previously opted in users
1 parent 968bf42 commit 9953991

File tree

6 files changed

+33
-0
lines changed

6 files changed

+33
-0
lines changed

compiler/fir/analysis-tests/testData/builtIns/kotlin.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1410,3 +1410,11 @@ public final object Unit : R|kotlin/Any| {
14101410

14111411
}
14121412

1413+
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|, R|kotlin/annotation/AnnotationTarget.PROPERTY|, R|kotlin/annotation/AnnotationTarget.CONSTRUCTOR|, R|kotlin/annotation/AnnotationTarget.FUNCTION|, R|kotlin/annotation/AnnotationTarget.TYPEALIAS|)) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.BINARY|) internal final annotation class WasExperimental : R|kotlin/Annotation| {
1414+
public final val markerClass: R|kotlin/Array<out kotlin/reflect/KClass<out kotlin/Annotation>>|
1415+
public get(): R|kotlin/Array<out kotlin/reflect/KClass<out kotlin/Annotation>>|
1416+
1417+
public constructor(vararg markerClass: R|kotlin/Array<out kotlin/reflect/KClass<out kotlin/Annotation>>|): R|kotlin/WasExperimental|
1418+
1419+
}
1420+

compiler/testData/builtin-classes/default/kotlin.txt

+6
Original file line numberDiff line numberDiff line change
@@ -811,3 +811,9 @@ public object Unit {
811811
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
812812
/*primary*/ public constructor UnsafeVariance()
813813
}
814+
815+
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.TYPEALIAS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) internal final annotation class WasExperimental : kotlin.Annotation {
816+
/*primary*/ public constructor WasExperimental(/*0*/ vararg markerClass: kotlin.reflect.KClass<out kotlin.Annotation> /*kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>*/)
817+
public final val markerClass: kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
818+
public final fun `<get-markerClass>`(): kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
819+
}

compiler/testData/builtin-classes/java6/kotlin.txt

+6
Original file line numberDiff line numberDiff line change
@@ -842,3 +842,9 @@ public object Unit {
842842
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
843843
/*primary*/ public constructor UnsafeVariance()
844844
}
845+
846+
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.TYPEALIAS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) internal final annotation class WasExperimental : kotlin.Annotation {
847+
/*primary*/ public constructor WasExperimental(/*0*/ vararg markerClass: kotlin.reflect.KClass<out kotlin.Annotation> /*kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>*/)
848+
public final val markerClass: kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
849+
public final fun `<get-markerClass>`(): kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
850+
}

compiler/testData/builtin-classes/java8/kotlin.txt

+6
Original file line numberDiff line numberDiff line change
@@ -849,3 +849,9 @@ public object Unit {
849849
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
850850
/*primary*/ public constructor UnsafeVariance()
851851
}
852+
853+
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.TYPEALIAS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) internal final annotation class WasExperimental : kotlin.Annotation {
854+
/*primary*/ public constructor WasExperimental(/*0*/ vararg markerClass: kotlin.reflect.KClass<out kotlin.Annotation> /*kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>*/)
855+
public final val markerClass: kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
856+
public final fun `<get-markerClass>`(): kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
857+
}

compiler/testData/builtin-classes/newMethods/kotlin.txt

+6
Original file line numberDiff line numberDiff line change
@@ -846,3 +846,9 @@ public object Unit {
846846
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.MustBeDocumented public final annotation class UnsafeVariance : kotlin.Annotation {
847847
/*primary*/ public constructor UnsafeVariance()
848848
}
849+
850+
@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.TYPEALIAS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) internal final annotation class WasExperimental : kotlin.Annotation {
851+
/*primary*/ public constructor WasExperimental(/*0*/ vararg markerClass: kotlin.reflect.KClass<out kotlin.Annotation> /*kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>*/)
852+
public final val markerClass: kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
853+
public final fun `<get-markerClass>`(): kotlin.Array<out kotlin.reflect.KClass<out kotlin.Annotation>>
854+
}

core/builtins/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ val prepareRangeSources by tasks.registering(Sync::class) {
4444
from(kotlinAnnotationsCommon) {
4545
include("ExperimentalStdlibApi.kt")
4646
include("OptIn.kt")
47+
include("WasExperimental.kt")
4748
}
4849

4950
into(rangesCherryPicked)

0 commit comments

Comments
 (0)