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

Move EnumEntries LVS to 1.9

Browse Source 
* Also cleanup tests to avoid using obsolete WITH_RUNTIME
This commit is contained in:
Vsevolod Tolstopyatov
2022-08-11 17:26:32 +02:00
committed by Space
parent 10ffdab438
commit 22e26d0756
8 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt
Vendored
+1 -1
View File
@@ -21,6 +21,6 @@ FILE: enum.kt
} }
public final static [BODY_RESOLVE] val entries: R|kotlin/enums/EnumEntries<Enum>| public final static [BODY_RESOLVE] val entries: R|kotlin/enums/EnumEntries<Enum>|
public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<Enum>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<Enum>|
} }
analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt
Vendored
+13 -13
View File
@@ -14,7 +14,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [TYPES] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -52,7 +52,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [TYPES] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -90,7 +90,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [TYPES] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -128,7 +128,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [TYPES] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -166,7 +166,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [TYPES] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| {
@@ -204,7 +204,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [TYPES] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -242,7 +242,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [TYPES] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -280,7 +280,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -318,7 +318,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -357,7 +357,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -396,7 +396,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| {
@@ -435,7 +435,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public final [SUPER_TYPES] annotation class Anno : R|kotlin/Annotation| { public final [SUPER_TYPES] annotation class Anno : R|kotlin/Annotation| {
@@ -474,7 +474,7 @@ FILE: annotationParameters.kt
} }
public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>| public final static [BODY_RESOLVE] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries<X>|
public [BODY_RESOLVE] get(): R|kotlin/enums/EnumEntries<X>| public [RAW_FIR] get(): R|kotlin/enums/EnumEntries<X>|
} }
public final [BODY_RESOLVE] annotation class Anno : R|kotlin/Annotation| { public final [BODY_RESOLVE] annotation class Anno : R|kotlin/Annotation| {
compiler/testData/codegen/boxInline/anonymousObject/enumEntries/callSite.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM_IR // TARGET_BACKEND: JVM_IR
// NO_CHECK_LAMBDA_INLINING // NO_CHECK_LAMBDA_INLINING
// WITH_RUNTIME
// WITH_STDLIB // WITH_STDLIB
compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSite.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM_IR // TARGET_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_STDLIB // WITH_STDLIB
// MODULE: lib // MODULE: lib
compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappings.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM_IR // TARGET_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_STDLIB // WITH_STDLIB
// MODULE: lib // MODULE: lib
compiler/testData/codegen/boxInline/anonymousObject/enumEntries/declSiteSeveralMappingsDifOrder.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// TARGET_BACKEND: JVM_IR // TARGET_BACKEND: JVM_IR
// WITH_RUNTIME
// WITH_STDLIB // WITH_STDLIB
// MODULE: lib // MODULE: lib
compiler/testData/diagnostics/testsWithStdLib/experimental/subClassOptInModality.txt
Vendored
+3
View File
@@ -45,6 +45,7 @@ public fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members // Static members
public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E1>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1 public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1
public final /*synthesized*/ fun values(): kotlin.Array<E1> public final /*synthesized*/ fun values(): kotlin.Array<E1>
} }
@@ -64,6 +65,7 @@ public final enum class E2 : kotlin.Enum<E2> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members // Static members
public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E2>
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E2 public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E2
public final /*synthesized*/ fun values(): kotlin.Array<E2> public final /*synthesized*/ fun values(): kotlin.Array<E2>
} }
@@ -164,3 +166,4 @@ public final annotation class Simple : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+1 -1
View File
@@ -264,7 +264,6 @@ enum class LanguageFeature(
GenericInlineClassParameter(sinceVersion = KOTLIN_1_8, kind = UNSTABLE_FEATURE), // KT-32162 GenericInlineClassParameter(sinceVersion = KOTLIN_1_8, kind = UNSTABLE_FEATURE), // KT-32162
DataObjects(KOTLIN_1_8), // KT-4107 DataObjects(KOTLIN_1_8), // KT-4107
LightweightLambdas(KOTLIN_1_8, defaultState = State.DISABLED), LightweightLambdas(KOTLIN_1_8, defaultState = State.DISABLED),
EnumEntries(KOTLIN_1_8, sinceApiVersion = ApiVersion.KOTLIN_1_8, defaultState = State.DISABLED), // KT-48872
// 1.9 // 1.9
@@ -284,6 +283,7 @@ enum class LanguageFeature(
SkipStandaloneScriptsInSourceRoots(KOTLIN_1_9, kind = OTHER), // KT-52525 SkipStandaloneScriptsInSourceRoots(KOTLIN_1_9, kind = OTHER), // KT-52525
ModifierNonBuiltinSuspendFunError(KOTLIN_1_9), ModifierNonBuiltinSuspendFunError(KOTLIN_1_9),
BreakContinueInInlineLambdas(KOTLIN_1_9, defaultState = State.ENABLED), // KT-1436 BreakContinueInInlineLambdas(KOTLIN_1_9, defaultState = State.ENABLED), // KT-1436
EnumEntries(KOTLIN_1_9, sinceApiVersion = ApiVersion.KOTLIN_1_8, defaultState = State.DISABLED), // KT-48872
// Disabled for indefinite time. See KT-48535 and related discussion // Disabled for indefinite time. See KT-48535 and related discussion
ApproximateIntegerLiteralTypesInReceiverPosition(sinceVersion = null), ApproximateIntegerLiteralTypesInReceiverPosition(sinceVersion = null),