From 6c12556c413f2a70e4ba17e04a67408b3380c9f9 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 10 Aug 2023 16:20:37 +0200 Subject: [PATCH] [IR][JVM] Drop JvmIrSerializerSession.expectDescriptorToSymbol parameter ^KT-61136 --- .../org/jetbrains/kotlin/backend/jvm/JvmIrSerializerImpl.kt | 1 - .../backend/jvm/serialization/JvmIrSerializerSession.kt | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/compiler/ir/backend.jvm/entrypoint/src/org/jetbrains/kotlin/backend/jvm/JvmIrSerializerImpl.kt b/compiler/ir/backend.jvm/entrypoint/src/org/jetbrains/kotlin/backend/jvm/JvmIrSerializerImpl.kt index 61c831ec8b2..9a1a2d5eb22 100644 --- a/compiler/ir/backend.jvm/entrypoint/src/org/jetbrains/kotlin/backend/jvm/JvmIrSerializerImpl.kt +++ b/compiler/ir/backend.jvm/entrypoint/src/org/jetbrains/kotlin/backend/jvm/JvmIrSerializerImpl.kt @@ -37,7 +37,6 @@ class JvmIrSerializerImpl(private val configuration: CompilerConfiguration) : Jv JvmIrSerializerSession( configuration.irMessageLogger, declarationTable, - mutableMapOf(), configuration.get(JVMConfigurationKeys.SERIALIZE_IR) ?: JvmSerializeIrMode.NONE, fileClassFqName, configuration.languageVersionSettings, diff --git a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIrSerializerSession.kt b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIrSerializerSession.kt index bcfbc7106ad..bfc40ada5fc 100644 --- a/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIrSerializerSession.kt +++ b/compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIrSerializerSession.kt @@ -11,10 +11,8 @@ import org.jetbrains.kotlin.backend.common.serialization.IrFileSerializer import org.jetbrains.kotlin.backend.jvm.serialization.proto.JvmIr import org.jetbrains.kotlin.config.JvmSerializeIrMode import org.jetbrains.kotlin.config.LanguageVersionSettings -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* -import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.util.IrMessageLogger import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.name.FqName @@ -23,13 +21,12 @@ import org.jetbrains.kotlin.synthetic.isVisibleOutside class JvmIrSerializerSession( messageLogger: IrMessageLogger, private val declarationTable: DeclarationTable, - expectDescriptorToSymbol: MutableMap, private val mode: JvmSerializeIrMode, private val fileClassFqName: FqName, languageVersionSettings: LanguageVersionSettings, skipExpects: Boolean = false, ) : IrFileSerializer( - messageLogger, declarationTable, expectDescriptorToSymbol, CompatibilityMode.CURRENT, languageVersionSettings, + messageLogger, declarationTable, CompatibilityMode.CURRENT, languageVersionSettings, bodiesOnlyForInlines = mode == JvmSerializeIrMode.INLINE, skipExpects, normalizeAbsolutePaths = false, sourceBaseDirs = emptyList() ) {