Fir2Ir: remove symbolTable as separate component from FirResult
It's already in components.
This commit is contained in:
committed by
Alexander Udalov
parent
3f66b31a47
commit
e0c175bb50
+3
-2
@@ -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()
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user