[IR] Remove unused IrMessageLogger from serialization logic

This commit is contained in:
Sergej Jaskiewicz
2024-01-19 18:54:10 +01:00
committed by Space Team
parent f88d09a2f6
commit c335cd0b1e
17 changed files with 9 additions and 49 deletions
@@ -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,
@@ -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,
@@ -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,