diff --git a/plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt b/plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt index d386801abbd..48db2ba3a91 100644 --- a/plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt +++ b/plugins/kotlinx-serialization/kotlinx-serialization.backend/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationLoweringExtension.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl import org.jetbrains.kotlin.backend.common.runOnFilePostfix import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.ir.fileParent +import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* @@ -154,6 +155,7 @@ open class SerializationLoweringExtension @JvmOverloads constructor( } private fun canEnableIntrinsics(ctx: JvmBackendContext): Boolean { + if (ctx.state.configuration[CommonConfigurationKeys.USE_FIR] == true) return false return when (intrinsicsState) { SerializationIntrinsicsState.FORCE_ENABLED -> true SerializationIntrinsicsState.DISABLED -> false diff --git a/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt b/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt index cb88655eaa2..3b4d9c661b8 100644 --- a/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt +++ b/plugins/kotlinx-serialization/testData/boxIr/intrinsicsBox.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_K2: JVM_IR // TARGET_BACKEND: JVM_IR // WITH_STDLIB diff --git a/plugins/kotlinx-serialization/testData/boxIr/intrinsicsStarProjections.kt b/plugins/kotlinx-serialization/testData/boxIr/intrinsicsStarProjections.kt index 34dac569ec5..e71ce33dd18 100644 --- a/plugins/kotlinx-serialization/testData/boxIr/intrinsicsStarProjections.kt +++ b/plugins/kotlinx-serialization/testData/boxIr/intrinsicsStarProjections.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_K2: JVM_IR // TARGET_BACKEND: JVM_IR // WITH_STDLIB