From 77c68fc8090219d55a8dc45d82697206afa56fc9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 6 Mar 2023 12:57:19 +0100 Subject: [PATCH] FIR: use ClassBuilderMode.FULL in FirMetadataSerializer ABI is a special mode which is used only by the deprecated legacy implementation of jvm-abi-gen. It is more reliable to use the standard FULL mode to prevent divergence in behavior from normal compilation. --- .../jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt index 84cb232f470..0c5c04ccff1 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.metadata.MetadataSerializer import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings -import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.backend.Fir2IrComponents @@ -92,7 +91,7 @@ fun makeLocalFirMetadataSerializerForMetadataSource( globalSerializationBindings, configuration.getBoolean(JVMConfigurationKeys.USE_TYPE_TABLE), targetId.name, - ClassBuilderMode.ABI, + ClassBuilderMode.FULL, configuration.getBoolean(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS), session.languageVersionSettings.apiVersion >= ApiVersion.KOTLIN_1_4 && !configuration.getBoolean(JVMConfigurationKeys.NO_UNIFIED_NULL_CHECKS),