[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
@@ -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,
@@ -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,
@@ -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>,
@@ -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,
@@ -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()
@@ -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,
@@ -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,
bodiesOnlyForInlines = bodiesOnlyForInlines,
skipPrivateApi = skipPrivateApi)
skipPrivateApi = skipPrivateApi
)
}