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 5b8dd42cebc..8d6283034ff 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 @@ -316,7 +316,7 @@ object FirKotlinToJvmBytecodeCompiler { session: FirSession, diagnosticsReporter: BaseDiagnosticsCollector ): GenerationState { - val (moduleFragment, symbolTable, components) = fir2IrResult + val (moduleFragment, components) = fir2IrResult val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext val codegenFactory = JvmIrCodegenFactory( moduleConfiguration, @@ -344,7 +344,8 @@ object FirKotlinToJvmBytecodeCompiler { generationState.beforeCompile() generationState.oldBEInitTrace(ktFiles) codegenFactory.generateModuleInFrontendIRMode( - generationState, moduleFragment, symbolTable, components.irProviders, extensions, FirJvmBackendExtension(session, components) + generationState, moduleFragment, components.symbolTable, components.irProviders, + extensions, FirJvmBackendExtension(session, components) ) { 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 3f068789d93..6bb92330c8e 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 @@ -190,7 +190,7 @@ fun convertAnalyzedFirToIr( // fir2ir val irGenerationExtensions = (environment.projectEnvironment as? VfsBasedProjectEnvironment)?.project?.let { IrGenerationExtension.getInstances(it) } - val (irModuleFragment, symbolTable, components) = + val (irModuleFragment, components) = analysisResults.session.convertToIr( analysisResults.scopeSession, analysisResults.fir, extensions, irGenerationExtensions ?: emptyList() ) @@ -200,7 +200,7 @@ fun convertAnalyzedFirToIr( input.configuration, extensions, irModuleFragment, - symbolTable, + components.symbolTable, components, analysisResults.session ) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt index ca332346d74..e5f04f27066 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt @@ -475,7 +475,7 @@ class Fir2IrConverter( allFirFiles, irModuleFragment, irGenerationExtensions, fir2irVisitor, languageVersionSettings, fir2IrExtensions ) - return Fir2IrResult(irModuleFragment, symbolTable, components) + return Fir2IrResult(irModuleFragment, components) } } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrResult.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrResult.kt index a65d21badef..97021aea83a 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrResult.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrResult.kt @@ -8,4 +8,4 @@ package org.jetbrains.kotlin.fir.backend import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.util.SymbolTable -data class Fir2IrResult(val irModuleFragment: IrModuleFragment, val symbolTable: SymbolTable, val components: Fir2IrComponents) +data class Fir2IrResult(val irModuleFragment: IrModuleFragment, val components: Fir2IrComponents) 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 0e202dacfac..d6edf55ad49 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 @@ -276,7 +276,7 @@ class IncrementalFirJvmCompilerRunner( .filter { it.kind == FirSession.Kind.Source } .flatMap { (it.firProvider as FirProviderImpl).getAllFirFiles() } - val (irModuleFragment, symbolTable, components) = Fir2IrConverter.createModuleFragment( + val (irModuleFragment, components) = Fir2IrConverter.createModuleFragment( cycleResult.session, cycleResult.scopeSession, cycleResult.fir + allCommonFirFiles, cycleResult.session.languageVersionSettings, signaturer, extensions, FirJvmKotlinMangler(cycleResult.session), IrFactoryImpl, @@ -292,7 +292,7 @@ class IncrementalFirJvmCompilerRunner( configuration, extensions, irModuleFragment, - symbolTable, + components.symbolTable, components, cycleResult.session ) 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 830aee71c30..0907b4abc80 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 @@ -43,7 +43,7 @@ class Fir2IrResultsConverter( val configuration = compilerConfigurationProvider.getCompilerConfiguration(module) val fir2IrExtensions = JvmFir2IrExtensions(configuration) - val (irModuleFragment, symbolTable, components) = inputArtifact.firAnalyzerFacade.convertToIr(fir2IrExtensions) + val (irModuleFragment, components) = inputArtifact.firAnalyzerFacade.convertToIr(fir2IrExtensions) val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext val phaseConfig = configuration.get(CLIConfigurationKeys.PHASE_CONFIG) @@ -76,7 +76,7 @@ class Fir2IrResultsConverter( codegenFactory, JvmIrCodegenFactory.JvmIrBackendInput( irModuleFragment, - symbolTable, + components.symbolTable, phaseConfig, components.irProviders, fir2IrExtensions, 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 7b025f1dec5..4ea60ca55fa 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 @@ -114,7 +114,7 @@ object GenerationUtils { IrGenerationExtension.getInstances(project) ) val fir2IrExtensions = JvmFir2IrExtensions(configuration) - val (moduleFragment, symbolTable, components) = firAnalyzerFacade.convertToIr(fir2IrExtensions) + val (moduleFragment, components) = firAnalyzerFacade.convertToIr(fir2IrExtensions) val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext val codegenFactory = JvmIrCodegenFactory( @@ -133,7 +133,7 @@ object GenerationUtils { generationState.beforeCompile() generationState.oldBEInitTrace(files) codegenFactory.generateModuleInFrontendIRMode( - generationState, moduleFragment, symbolTable, components.irProviders, + generationState, moduleFragment, components.symbolTable, components.irProviders, fir2IrExtensions, FirJvmBackendExtension(session, components), ) {}