From 8b8088720b9ec9c8e08fd34f419b0adf92998577 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 21 Sep 2023 10:29:34 +0200 Subject: [PATCH] Rename: DeserializedContainerAbiStability.IR_UNSTABLE -> UNSTABLE Related to KT-62056 --- .../fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt | 2 +- .../kotlin/resolve/checkers/MissingDependencyClassChecker.kt | 2 +- .../deserialization/descriptors/DeserializedContainerSource.kt | 2 +- .../kotlin/load/kotlin/DeserializedDescriptorResolver.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt index 434d63490b3..471ee9ff8a9 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmClassFileBasedSymbolProvider.kt @@ -136,7 +136,7 @@ class JvmClassFileBasedSymbolProvider( private val KotlinJvmBinaryClass.abiStability: DeserializedContainerAbiStability get() = when { session.languageVersionSettings.getFlag(AnalysisFlags.allowUnstableDependencies) -> DeserializedContainerAbiStability.STABLE - classHeader.isUnstableJvmIrBinary -> DeserializedContainerAbiStability.IR_UNSTABLE + classHeader.isUnstableJvmIrBinary -> DeserializedContainerAbiStability.UNSTABLE else -> DeserializedContainerAbiStability.STABLE } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt index 84f5ffe3820..95c443d5c1f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt @@ -59,7 +59,7 @@ object MissingDependencyClassChecker : CallChecker { if (source.isPreReleaseInvisible) { return PRE_RELEASE_CLASS.on(reportOn, source.presentableString) } - if (source.abiStability == DeserializedContainerAbiStability.IR_UNSTABLE) { + if (source.abiStability == DeserializedContainerAbiStability.UNSTABLE) { return IR_WITH_UNSTABLE_ABI_COMPILED_CLASS.on(reportOn, source.presentableString) } } diff --git a/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt b/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt index b529f5b04d9..4eab4b844d7 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt @@ -32,5 +32,5 @@ enum class DeserializedContainerAbiStability { // 2) it is compiled with JVM IR >= 1.4.30 with the `-Xabi-stability=unstable` compiler option, // 3) it is compiled with FIR prior to 2.0.0, // and this compiler is _not_ configured to ignore that. - IR_UNSTABLE, + UNSTABLE, } diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt index a16d755fb6a..96e0bbbc91f 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt @@ -112,7 +112,7 @@ class DeserializedDescriptorResolver { private val KotlinJvmBinaryClass.abiStability: DeserializedContainerAbiStability get() = when { components.configuration.allowUnstableDependencies -> DeserializedContainerAbiStability.STABLE - classHeader.isUnstableJvmIrBinary -> DeserializedContainerAbiStability.IR_UNSTABLE + classHeader.isUnstableJvmIrBinary -> DeserializedContainerAbiStability.UNSTABLE else -> DeserializedContainerAbiStability.STABLE }