Fir2Ir: remove symbolTable as separate component from FirResult

It's already in components.
This commit is contained in:
Georgy Bronnikov
2021-12-09 16:37:06 +03:00
committed by Alexander Udalov
parent 3f66b31a47
commit e0c175bb50
7 changed files with 13 additions and 12 deletions
@@ -316,7 +316,7 @@ object FirKotlinToJvmBytecodeCompiler {
session: FirSession, session: FirSession,
diagnosticsReporter: BaseDiagnosticsCollector diagnosticsReporter: BaseDiagnosticsCollector
): GenerationState { ): GenerationState {
val (moduleFragment, symbolTable, components) = fir2IrResult val (moduleFragment, components) = fir2IrResult
val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext
val codegenFactory = JvmIrCodegenFactory( val codegenFactory = JvmIrCodegenFactory(
moduleConfiguration, moduleConfiguration,
@@ -344,7 +344,8 @@ object FirKotlinToJvmBytecodeCompiler {
generationState.beforeCompile() generationState.beforeCompile()
generationState.oldBEInitTrace(ktFiles) generationState.oldBEInitTrace(ktFiles)
codegenFactory.generateModuleInFrontendIRMode( codegenFactory.generateModuleInFrontendIRMode(
generationState, moduleFragment, symbolTable, components.irProviders, extensions, FirJvmBackendExtension(session, components) generationState, moduleFragment, components.symbolTable, components.irProviders,
extensions, FirJvmBackendExtension(session, components)
) { ) {
performanceManager?.notifyIRLoweringFinished() performanceManager?.notifyIRLoweringFinished()
performanceManager?.notifyIRGenerationStarted() performanceManager?.notifyIRGenerationStarted()
@@ -190,7 +190,7 @@ fun convertAnalyzedFirToIr(
// fir2ir // fir2ir
val irGenerationExtensions = val irGenerationExtensions =
(environment.projectEnvironment as? VfsBasedProjectEnvironment)?.project?.let { IrGenerationExtension.getInstances(it) } (environment.projectEnvironment as? VfsBasedProjectEnvironment)?.project?.let { IrGenerationExtension.getInstances(it) }
val (irModuleFragment, symbolTable, components) = val (irModuleFragment, components) =
analysisResults.session.convertToIr( analysisResults.session.convertToIr(
analysisResults.scopeSession, analysisResults.fir, extensions, irGenerationExtensions ?: emptyList() analysisResults.scopeSession, analysisResults.fir, extensions, irGenerationExtensions ?: emptyList()
) )
@@ -200,7 +200,7 @@ fun convertAnalyzedFirToIr(
input.configuration, input.configuration,
extensions, extensions,
irModuleFragment, irModuleFragment,
symbolTable, components.symbolTable,
components, components,
analysisResults.session analysisResults.session
) )
@@ -475,7 +475,7 @@ class Fir2IrConverter(
allFirFiles, irModuleFragment, irGenerationExtensions, fir2irVisitor, languageVersionSettings, fir2IrExtensions allFirFiles, irModuleFragment, irGenerationExtensions, fir2irVisitor, languageVersionSettings, fir2IrExtensions
) )
return Fir2IrResult(irModuleFragment, symbolTable, components) return Fir2IrResult(irModuleFragment, components)
} }
} }
@@ -8,4 +8,4 @@ package org.jetbrains.kotlin.fir.backend
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
import org.jetbrains.kotlin.ir.util.SymbolTable 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)
@@ -276,7 +276,7 @@ class IncrementalFirJvmCompilerRunner(
.filter { it.kind == FirSession.Kind.Source } .filter { it.kind == FirSession.Kind.Source }
.flatMap { (it.firProvider as FirProviderImpl).getAllFirFiles() } .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, cycleResult.scopeSession, cycleResult.fir + allCommonFirFiles,
cycleResult.session.languageVersionSettings, signaturer, cycleResult.session.languageVersionSettings, signaturer,
extensions, FirJvmKotlinMangler(cycleResult.session), IrFactoryImpl, extensions, FirJvmKotlinMangler(cycleResult.session), IrFactoryImpl,
@@ -292,7 +292,7 @@ class IncrementalFirJvmCompilerRunner(
configuration, configuration,
extensions, extensions,
irModuleFragment, irModuleFragment,
symbolTable, components.symbolTable,
components, components,
cycleResult.session cycleResult.session
) )
@@ -43,7 +43,7 @@ class Fir2IrResultsConverter(
val configuration = compilerConfigurationProvider.getCompilerConfiguration(module) val configuration = compilerConfigurationProvider.getCompilerConfiguration(module)
val fir2IrExtensions = JvmFir2IrExtensions(configuration) val fir2IrExtensions = JvmFir2IrExtensions(configuration)
val (irModuleFragment, symbolTable, components) = inputArtifact.firAnalyzerFacade.convertToIr(fir2IrExtensions) val (irModuleFragment, components) = inputArtifact.firAnalyzerFacade.convertToIr(fir2IrExtensions)
val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext
val phaseConfig = configuration.get(CLIConfigurationKeys.PHASE_CONFIG) val phaseConfig = configuration.get(CLIConfigurationKeys.PHASE_CONFIG)
@@ -76,7 +76,7 @@ class Fir2IrResultsConverter(
codegenFactory, codegenFactory,
JvmIrCodegenFactory.JvmIrBackendInput( JvmIrCodegenFactory.JvmIrBackendInput(
irModuleFragment, irModuleFragment,
symbolTable, components.symbolTable,
phaseConfig, phaseConfig,
components.irProviders, components.irProviders,
fir2IrExtensions, fir2IrExtensions,
@@ -114,7 +114,7 @@ object GenerationUtils {
IrGenerationExtension.getInstances(project) IrGenerationExtension.getInstances(project)
) )
val fir2IrExtensions = JvmFir2IrExtensions(configuration) val fir2IrExtensions = JvmFir2IrExtensions(configuration)
val (moduleFragment, symbolTable, components) = firAnalyzerFacade.convertToIr(fir2IrExtensions) val (moduleFragment, components) = firAnalyzerFacade.convertToIr(fir2IrExtensions)
val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext
val codegenFactory = JvmIrCodegenFactory( val codegenFactory = JvmIrCodegenFactory(
@@ -133,7 +133,7 @@ object GenerationUtils {
generationState.beforeCompile() generationState.beforeCompile()
generationState.oldBEInitTrace(files) generationState.oldBEInitTrace(files)
codegenFactory.generateModuleInFrontendIRMode( codegenFactory.generateModuleInFrontendIRMode(
generationState, moduleFragment, symbolTable, components.irProviders, generationState, moduleFragment, components.symbolTable, components.irProviders,
fir2IrExtensions, FirJvmBackendExtension(session, components), fir2IrExtensions, FirJvmBackendExtension(session, components),
) {} ) {}