From c3a94e1e62c451451e9e2b2b5a483321500942c2 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Wed, 16 Jun 2021 14:25:40 +0300 Subject: [PATCH] FIR: adapt to changes in IR interface JvmGeneratorExtensionsImpl, JvmIrCodegenFactory need new arguments. --- .../cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 0d376f94e65..99d6a440006 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 @@ -158,14 +158,18 @@ object FirKotlinToJvmBytecodeCompiler { performanceManager?.notifyGenerationStarted() performanceManager?.notifyIRTranslationStarted() - val extensions = JvmGeneratorExtensionsImpl() + val extensions = JvmGeneratorExtensionsImpl(projectConfiguration) val (moduleFragment, symbolTable, components) = firAnalyzerFacade.convertToIr(extensions) performanceManager?.notifyIRTranslationFinished() 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 val container = TopDownAnalyzerFacadeForJVM.createContainer(