azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: adapt to changes in IR interface

Browse Source 
JvmGeneratorExtensionsImpl, JvmIrCodegenFactory need new arguments.
This commit is contained in:
Georgy Bronnikov
2021-06-16 14:25:40 +03:00
committed by TeamCityServer
parent 20b76d4149
commit c3a94e1e62
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt
+6 -2
View File
@@ -158,14 +158,18 @@ object FirKotlinToJvmBytecodeCompiler {
performanceManager?.notifyGenerationStarted() performanceManager?.notifyGenerationStarted()
performanceManager?.notifyIRTranslationStarted() performanceManager?.notifyIRTranslationStarted()
val extensions = JvmGeneratorExtensionsImpl() val extensions = JvmGeneratorExtensionsImpl(projectConfiguration)
val (moduleFragment, symbolTable, components) = firAnalyzerFacade.convertToIr(extensions) val (moduleFragment, symbolTable, components) = firAnalyzerFacade.convertToIr(extensions)
performanceManager?.notifyIRTranslationFinished() performanceManager?.notifyIRTranslationFinished()
val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext
val codegenFactory = JvmIrCodegenFactory(moduleConfiguration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jvmPhases)) val codegenFactory = JvmIrCodegenFactory(
projectConfiguration,
moduleConfiguration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jvmPhases),
jvmGeneratorExtensions = extensions
)
// Create and initialize the module and its dependencies // Create and initialize the module and its dependencies
val container = TopDownAnalyzerFacadeForJVM.createContainer( val container = TopDownAnalyzerFacadeForJVM.createContainer(