[IR] Remove unused IrMessageLogger from serialization logic

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/compilerPipeline.kt

@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider
 import org.jetbrains.kotlin.ir.backend.js.*
 import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerIr
 import org.jetbrains.kotlin.ir.types.IrTypeSystemContextImpl
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.js.config.JSConfigurationKeys
 import org.jetbrains.kotlin.js.config.WasmTarget
 import org.jetbrains.kotlin.js.resolve.JsPlatformAnalyzerServices
@@ -315,7 +314,6 @@ fun serializeFirKlib(
     serializeModuleIntoKlib(
         moduleStructure.compilerConfiguration[CommonConfigurationKeys.MODULE_NAME]!!,
         moduleStructure.compilerConfiguration,
-        moduleStructure.compilerConfiguration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None,
         diagnosticsReporter,
         fir2KlibSerializer.sourceFiles,
         klibPath = outputKlibPath,

compiler/ir/backend.jvm/entrypoint/src/org/jetbrains/kotlin/backend/jvm/JvmIrSerializerImpl.kt

@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.config.JvmSerializeIrMode
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrFile
-import org.jetbrains.kotlin.ir.util.irMessageLogger
 import org.jetbrains.kotlin.name.FqName
 
 class JvmIrSerializerImpl(private val configuration: CompilerConfiguration) : JvmIrSerializer {
@@ -35,7 +34,6 @@ class JvmIrSerializerImpl(private val configuration: CompilerConfiguration) : Jv
 
     private fun makeSerializerSession(fileClassFqName: FqName) =
         JvmIrSerializerSession(
-            configuration.irMessageLogger,
             declarationTable,
             configuration.get(JVMConfigurationKeys.SERIALIZE_IR) ?: JvmSerializeIrMode.NONE,
             fileClassFqName,

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt

@@ -107,7 +107,6 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommo
 import org.jetbrains.kotlin.backend.common.serialization.proto.NullableIrExpression as ProtoNullableIrExpression
 
 open class IrFileSerializer(
-    val messageLogger: IrMessageLogger,
     private val declarationTable: DeclarationTable,
     private val compatibilityMode: CompatibilityMode,
     private val languageVersionSettings: LanguageVersionSettings,

compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt

@@ -6,17 +6,14 @@
 package org.jetbrains.kotlin.backend.common.serialization
 
 import org.jetbrains.kotlin.builtins.FunctionInterfacePackageFragment
-import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.ir.IrDiagnosticReporter
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.library.SerializedIrFile
 import org.jetbrains.kotlin.library.SerializedIrModule
 
 abstract class IrModuleSerializer<Serializer : IrFileSerializer>(
     protected val diagnosticReporter: IrDiagnosticReporter,
-    protected val messageLogger: IrMessageLogger,
     protected val compatibilityMode: CompatibilityMode,
     protected val normalizeAbsolutePaths: Boolean,
     protected val sourceBaseDirs: Collection<String>,

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt

@@ -117,12 +117,10 @@ fun generateKLib(
     val files = (depsDescriptors.mainModule as MainModule.SourceFiles).files.map(::KtPsiSourceFile)
     val configuration = depsDescriptors.compilerConfiguration
     val allDependencies = depsDescriptors.allDependencies
-    val messageLogger = configuration.irMessageLogger
 
     serializeModuleIntoKlib(
         configuration[CommonConfigurationKeys.MODULE_NAME]!!,
         configuration,
-        messageLogger,
         diagnosticReporter,
         files,
         outputKlibPath,
@@ -612,7 +610,6 @@ private fun String.parseSerializedIrFileFingerprints(): List<SerializedIrFileFin
 fun serializeModuleIntoKlib(
     moduleName: String,
     configuration: CompilerConfiguration,
-    messageLogger: IrMessageLogger,
     diagnosticReporter: DiagnosticReporter,
     files: List<KtSourceFile>,
     klibPath: String,
@@ -645,7 +642,6 @@ fun serializeModuleIntoKlib(
     val serializedIr =
         JsIrModuleSerializer(
             irDiagnosticReporter,
-            messageLogger,
             moduleFragment.irBuiltins,
             compatibilityMode,
             normalizeAbsolutePaths = absolutePathNormalization,

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrFileSerializer.kt

@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.backend.common.serialization.IrFileSerializer
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
 import org.jetbrains.kotlin.ir.declarations.IrFile
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 
 fun interface JsIrFileMetadataFactory {
     fun createJsIrFileMetadata(irFile: IrFile): JsIrFileMetadata
@@ -22,7 +21,6 @@ object JsIrFileEmptyMetadataFactory : JsIrFileMetadataFactory {
 }
 
 class JsIrFileSerializer(
-    messageLogger: IrMessageLogger,
     declarationTable: DeclarationTable,
     compatibilityMode: CompatibilityMode,
     languageVersionSettings: LanguageVersionSettings,
@@ -31,7 +29,6 @@ class JsIrFileSerializer(
     sourceBaseDirs: Collection<String>,
     private val jsIrFileMetadataFactory: JsIrFileMetadataFactory
 ) : IrFileSerializer(
-    messageLogger,
     declarationTable,
     compatibilityMode = compatibilityMode,
     languageVersionSettings = languageVersionSettings,

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrModuleSerializer.kt

@@ -9,15 +9,12 @@ import org.jetbrains.kotlin.backend.common.serialization.CompatibilityMode
 import org.jetbrains.kotlin.backend.common.serialization.DeclarationTable
 import org.jetbrains.kotlin.backend.common.serialization.IrModuleSerializer
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.ir.IrBuiltIns
 import org.jetbrains.kotlin.ir.IrDiagnosticReporter
 import org.jetbrains.kotlin.ir.declarations.IrFile
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 
 class JsIrModuleSerializer(
     diagnosticReporter: IrDiagnosticReporter,
-    messageLogger: IrMessageLogger,
     irBuiltIns: IrBuiltIns,
     compatibilityMode: CompatibilityMode,
     normalizeAbsolutePaths: Boolean,
@@ -27,7 +24,6 @@ class JsIrModuleSerializer(
     private val jsIrFileMetadataFactory: JsIrFileMetadataFactory = JsIrFileEmptyMetadataFactory,
 ) : IrModuleSerializer<JsIrFileSerializer>(
     diagnosticReporter,
-    messageLogger,
     compatibilityMode,
     normalizeAbsolutePaths,
     sourceBaseDirs,
@@ -38,7 +34,6 @@ class JsIrModuleSerializer(
 
     override fun createSerializerForFile(file: IrFile): JsIrFileSerializer =
         JsIrFileSerializer(
-            messageLogger,
             DeclarationTable(globalDeclarationTable),
             compatibilityMode = compatibilityMode,
             normalizeAbsolutePaths = normalizeAbsolutePaths,

compiler/ir/serialization.jvm/src/org/jetbrains/kotlin/backend/jvm/serialization/JvmIrSerializerSession.kt

@@ -13,19 +13,18 @@ import org.jetbrains.kotlin.config.JvmSerializeIrMode
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.synthetic.isVisibleOutside
 
 class JvmIrSerializerSession(
-    messageLogger: IrMessageLogger,
     private val declarationTable: DeclarationTable,
     private val mode: JvmSerializeIrMode,
     private val fileClassFqName: FqName,
     languageVersionSettings: LanguageVersionSettings,
 ) : IrFileSerializer(
-    messageLogger, declarationTable, compatibilityMode = CompatibilityMode.CURRENT,
+    declarationTable,
+    compatibilityMode = CompatibilityMode.CURRENT,
     languageVersionSettings = languageVersionSettings,
     bodiesOnlyForInlines = mode == JvmSerializeIrMode.INLINE,
     normalizeAbsolutePaths = false, sourceBaseDirs = emptyList()

compiler/ir/serialization.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrFileSerializer.kt

@@ -12,12 +12,10 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrFunction
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.ir.util.hasAnnotation
 import org.jetbrains.kotlin.name.NativeRuntimeNames
 
 class KonanIrFileSerializer(
-    messageLogger: IrMessageLogger,
     declarationTable: DeclarationTable,
     languageVersionSettings: LanguageVersionSettings,
     bodiesOnlyForInlines: Boolean = false,
@@ -26,7 +24,6 @@ class KonanIrFileSerializer(
     sourceBaseDirs: Collection<String>,
     skipPrivateApi: Boolean = false,
 ) : IrFileSerializer(
-    messageLogger,
     declarationTable,
     compatibilityMode,
     languageVersionSettings,

compiler/ir/serialization.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrModuleSerializer.kt

@@ -8,16 +8,13 @@ package org.jetbrains.kotlin.backend.konan.serialization
 import org.jetbrains.kotlin.backend.common.serialization.CompatibilityMode
 import org.jetbrains.kotlin.backend.common.serialization.IrModuleSerializer
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.ir.IrBuiltIns
 import org.jetbrains.kotlin.ir.IrDiagnosticReporter
 import org.jetbrains.kotlin.ir.declarations.IrFile
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.name.NativeStandardInteropNames
 
 class KonanIrModuleSerializer(
         diagnosticReporter: IrDiagnosticReporter,
-        messageLogger: IrMessageLogger,
         irBuiltIns: IrBuiltIns,
         compatibilityMode: CompatibilityMode,
         normalizeAbsolutePaths: Boolean,
@@ -28,7 +25,6 @@ class KonanIrModuleSerializer(
         shouldCheckSignaturesOnUniqueness: Boolean = true,
 ) : IrModuleSerializer<KonanIrFileSerializer>(
         diagnosticReporter,
-        messageLogger,
         compatibilityMode,
         normalizeAbsolutePaths,
         sourceBaseDirs,
@@ -47,11 +43,13 @@ class KonanIrModuleSerializer(
         file.fileEntry.name != NativeStandardInteropNames.cTypeDefinitionsFileName
 
     override fun createSerializerForFile(file: IrFile): KonanIrFileSerializer =
-            KonanIrFileSerializer(messageLogger, KonanDeclarationTable(globalDeclarationTable),
+            KonanIrFileSerializer(
+                    KonanDeclarationTable(globalDeclarationTable),
+                    languageVersionSettings = languageVersionSettings,
+                    bodiesOnlyForInlines = bodiesOnlyForInlines,
                     compatibilityMode = compatibilityMode,
                     normalizeAbsolutePaths = normalizeAbsolutePaths,
                     sourceBaseDirs = sourceBaseDirs,
-                    languageVersionSettings = languageVersionSettings,
+                    skipPrivateApi = skipPrivateApi
-                    bodiesOnlyForInlines = bodiesOnlyForInlines,
+            )
-                    skipPrivateApi = skipPrivateApi)
 }

compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibIrTextTestCase.kt

@@ -153,7 +153,6 @@ abstract class AbstractKlibIrTextTestCase : CodegenTestCase() {
                 DiagnosticReporterFactory.createPendingReporter(),
                 myEnvironment.configuration.languageVersionSettings,
             ),
-            IrMessageLogger.None,
             irModuleFragment.irBuiltins,
             CompatibilityMode.CURRENT,
             false,

js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt

@@ -498,7 +498,6 @@ class GenerateIrRuntime {
         serializeModuleIntoKlib(
             moduleName,
             configuration,
-            IrMessageLogger.None,
             diagnosticReporter,
             files.map(::KtPsiSourceFile),
             tmpKlibDir,
@@ -534,7 +533,6 @@ class GenerateIrRuntime {
                 DiagnosticReporterFactory.createPendingReporter(),
                 configuration.languageVersionSettings,
             ),
-            IrMessageLogger.None,
             module.irBuiltins,
             CompatibilityMode.CURRENT,
             normalizeAbsolutePaths = false,

js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt

@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.ir.backend.js.JsFactories
 import org.jetbrains.kotlin.ir.backend.js.serializeModuleIntoKlib
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.js.test.utils.JsIrIncrementalDataProvider
 import org.jetbrains.kotlin.js.test.utils.jsIrIncrementalDataProvider
 import org.jetbrains.kotlin.library.KotlinAbiVersion
@@ -61,7 +60,6 @@ class FirJsKlibBackendFacade(
             serializeModuleIntoKlib(
                 configuration[CommonConfigurationKeys.MODULE_NAME]!!,
                 configuration,
-                configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None,
                 inputArtifact.diagnosticReporter,
                 inputArtifact.sourceFiles,
                 klibPath = outputFile,

js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt

@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.ir.backend.js.*
-import org.jetbrains.kotlin.ir.util.irMessageLogger
 import org.jetbrains.kotlin.js.test.utils.JsIrIncrementalDataProvider
 import org.jetbrains.kotlin.js.test.utils.jsIrIncrementalDataProvider
 import org.jetbrains.kotlin.library.KotlinAbiVersion
@@ -51,7 +50,6 @@ class JsKlibBackendFacade(
             serializeModuleIntoKlib(
                 configuration[CommonConfigurationKeys.MODULE_NAME]!!,
                 configuration,
-                configuration.irMessageLogger,
                 inputArtifact.diagnosticReporter,
                 inputArtifact.sourceFiles,
                 klibPath = outputFile,

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt

@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.providers.firProvider
 import org.jetbrains.kotlin.fir.serialization.*
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.konan.library.KonanLibrary
 import org.jetbrains.kotlin.library.SerializedIrFile
 import org.jetbrains.kotlin.library.metadata.resolver.TopologicalLibraryOrder
@@ -76,7 +75,6 @@ internal fun PhaseContext.firSerializerBase(
     val serializerOutput = serializeNativeModule(
             configuration = configuration,
             diagnosticReporter = diagnosticReporter,
-            messageLogger = configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None,
             sourceFiles,
             usedResolvedLibraries?.map { it.library as KonanLibrary },
             fir2IrOutput?.irModuleFragment,
@@ -127,7 +125,7 @@ class KotlinFileSerializedData(
 
 private fun serializeNativeModule(
         configuration: CompilerConfiguration,
-        diagnosticReporter: DiagnosticReporter,messageLogger: IrMessageLogger,
+        diagnosticReporter: DiagnosticReporter,
         files: List<KtSourceFile>,
         dependencies: List<KonanLibrary>?,
         moduleFragment: IrModuleFragment?,
@@ -148,7 +146,6 @@ private fun serializeNativeModule(
     val serializedIr = moduleFragment?.let {
         KonanIrModuleSerializer(
                 KtDiagnosticReporterWithImplicitIrBasedContext(diagnosticReporter, configuration.languageVersionSettings),
-                messageLogger,
                 moduleFragment.irBuiltins,
                 CompatibilityMode.CURRENT,
                 normalizeAbsolutePaths = absolutePathNormalization,

kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/Serializer.kt

@@ -39,7 +39,6 @@ internal val SerializerPhase = createSimpleNamedCompilerPhase<PhaseContext, Seri
         outputIfNotEnabled = { _, _, _, _ -> SerializerOutput(null, null, null, emptyList()) }
 ) { context: PhaseContext, input: SerializerInput ->
     val config = context.config
-    val messageLogger = config.configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None
     val relativePathBase = config.configuration.get(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES) ?: emptyList()
     val normalizeAbsolutePaths = config.configuration.get(CommonConfigurationKeys.KLIB_NORMALIZE_ABSOLUTE_PATH) ?: false
 
@@ -50,7 +49,6 @@ internal val SerializerPhase = createSimpleNamedCompilerPhase<PhaseContext, Seri
                         DiagnosticReporterFactory.createPendingReporter(),
                         config.languageVersionSettings
                 ),
-                messageLogger,
                 ir.irBuiltins,
                 compatibilityMode = CompatibilityMode.CURRENT,
                 normalizeAbsolutePaths = normalizeAbsolutePaths,

wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibBackendFacade.kt

@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.ir.backend.js.JsFactories
 import org.jetbrains.kotlin.ir.backend.js.serializeModuleIntoKlib
-import org.jetbrains.kotlin.ir.util.IrMessageLogger
 import org.jetbrains.kotlin.js.config.JSConfigurationKeys
 import org.jetbrains.kotlin.js.config.WasmTarget
 import org.jetbrains.kotlin.library.KotlinAbiVersion
@@ -61,7 +60,6 @@ class FirWasmKlibBackendFacade(
             serializeModuleIntoKlib(
                 configuration[CommonConfigurationKeys.MODULE_NAME]!!,
                 configuration,
-                configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None,
                 inputArtifact.diagnosticReporter,
                 inputArtifact.sourceFiles,
                 klibPath = outputFile,