From 0f9107c153d13da96927f0752c590ceb83188d28 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Fri, 27 Jan 2023 16:34:06 +0100 Subject: [PATCH] [FIR2IR] Remove passing excess arguments to jvm backend functions and classes generateModuleInFrontendIRMode, runBackend FirJvmBackendExtension, ModuleCompilerIrBackendInput --- .../cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt | 4 +--- .../kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt | 6 ++---- .../cli/jvm/compiler/pipeline/compilerPipelineData.kt | 6 ------ .../kotlin/fir/backend/jvm/FirJvmBackendExtension.kt | 5 ++--- .../kotlin/incremental/IncrementalFirJvmCompilerRunner.kt | 2 -- .../kotlin/test/frontend/fir/Fir2IrResultsConverter.kt | 2 +- .../tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt | 2 +- 7 files changed, 7 insertions(+), 20 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt index 9f690144f06..15d525c35f8 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt @@ -171,7 +171,6 @@ object FirKotlinToJvmBytecodeCompiler { allSources, fir2IrResult, fir2IrExtensions, - firResult.platformOutput.session, diagnosticsReporter ) @@ -310,7 +309,6 @@ object FirKotlinToJvmBytecodeCompiler { ktFiles: List, fir2IrResult: Fir2IrResult, extensions: JvmGeneratorExtensions, - session: FirSession, diagnosticsReporter: BaseDiagnosticsCollector ): GenerationState { val (moduleFragment, components) = fir2IrResult @@ -342,7 +340,7 @@ object FirKotlinToJvmBytecodeCompiler { generationState.oldBEInitTrace(ktFiles) codegenFactory.generateModuleInFrontendIRMode( generationState, moduleFragment, components.symbolTable, components.irProviders, - extensions, FirJvmBackendExtension(session, components), fir2IrResult.pluginContext + extensions, FirJvmBackendExtension(components), fir2IrResult.pluginContext ) { performanceManager?.notifyIRLoweringFinished() performanceManager?.notifyIRGenerationStarted() diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt index ccae4b0141a..45bbba83d02 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt @@ -228,9 +228,7 @@ fun convertAnalyzedFirToIr( input.configuration, extensions, irModuleFragment, - components.symbolTable, components, - analysisResults.platformOutput.session, pluginContext ) } @@ -272,10 +270,10 @@ fun generateCodeFromIr( codegenFactory.generateModuleInFrontendIRMode( generationState, input.irModuleFragment, - input.symbolTable, + input.components.symbolTable, input.components.irProviders, input.extensions, - FirJvmBackendExtension(input.firSession, input.components), + FirJvmBackendExtension(input.components), input.pluginContext ) { performanceManager?.notifyIRLoweringFinished() diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt index 028a0a6f082..c7fe7987588 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt @@ -10,15 +10,11 @@ import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.backend.Fir2IrComponents import org.jetbrains.kotlin.fir.backend.Fir2IrPluginContext import org.jetbrains.kotlin.fir.backend.jvm.JvmFir2IrExtensions -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.session.environment.AbstractProjectEnvironment import org.jetbrains.kotlin.ir.declarations.IrModuleFragment -import org.jetbrains.kotlin.ir.util.SymbolTable import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.platform.TargetPlatform @@ -48,8 +44,6 @@ data class ModuleCompilerIrBackendInput( val configuration: CompilerConfiguration, val extensions: JvmFir2IrExtensions, val irModuleFragment: IrModuleFragment, - val symbolTable: SymbolTable, val components: Fir2IrComponents, - val firSession: FirSession, val pluginContext: Fir2IrPluginContext ) diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt index 2f34aa799c2..0344bea059f 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt @@ -10,13 +10,12 @@ import org.jetbrains.kotlin.backend.jvm.JvmBackendExtension import org.jetbrains.kotlin.backend.jvm.metadata.MetadataSerializer import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings import org.jetbrains.kotlin.config.JvmAbiStability -import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.backend.Fir2IrComponents import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.org.objectweb.asm.Type -class FirJvmBackendExtension(private val session: FirSession, private val components: Fir2IrComponents) : JvmBackendExtension { +class FirJvmBackendExtension(private val components: Fir2IrComponents) : JvmBackendExtension { override fun createSerializer( context: JvmBackendContext, klass: IrClass, @@ -24,7 +23,7 @@ class FirJvmBackendExtension(private val session: FirSession, private val compon bindings: JvmSerializationBindings, parentSerializer: MetadataSerializer? ): MetadataSerializer { - return makeFirMetadataSerializerForIrClass(session, context, klass, bindings, components, parentSerializer) + return makeFirMetadataSerializerForIrClass(components.session, context, klass, bindings, components, parentSerializer) } override fun generateMetadataExtraFlags(abiStability: JvmAbiStability?): Int = diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt index e0d8b4898a2..2dc4530659f 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt @@ -284,9 +284,7 @@ class IncrementalFirJvmCompilerRunner( configuration, extensions, platformIrOutput.irModuleFragment, - platformIrOutput.components.symbolTable, platformIrOutput.components, - cycleResult.platformOutput.session, platformIrOutput.pluginContext ) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt index eaca6f4c765..9ee6522ffbf 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt @@ -103,7 +103,7 @@ class Fir2IrResultsConverter( phaseConfig, components.irProviders, fir2IrExtensions, - FirJvmBackendExtension(firOutputPart.session, components), + FirJvmBackendExtension(components), pluginContext, notifyCodegenStart = {}, ) diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt index b5f0f4fd1b3..07fe22af396 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt @@ -160,7 +160,7 @@ object GenerationUtils { generationState.oldBEInitTrace(files) codegenFactory.generateModuleInFrontendIRMode( generationState, moduleFragment, components.symbolTable, components.irProviders, - fir2IrExtensions, FirJvmBackendExtension(session, components), pluginContext, + fir2IrExtensions, FirJvmBackendExtension(components), pluginContext, ) {} generationState.factory.done()