From 048e7a7075500b3d6a98cd5037fe830a8a70458a Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 28 May 2020 10:54:15 +0300 Subject: [PATCH] [FIR] Add forgotten FirJvmBackendClassResolver to CLI --- .../kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt index 80314b383d2..2c3211b50d4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt @@ -55,6 +55,7 @@ import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.backend.Fir2IrConverter +import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver import org.jetbrains.kotlin.fir.backend.jvm.FirJvmClassCodegen import org.jetbrains.kotlin.fir.builder.RawFirBuilder import org.jetbrains.kotlin.fir.extensions.BunchOfRegisteredExtensions @@ -349,7 +350,7 @@ object KotlinToJVMBytecodeCompiler { val signaturer = IdSignatureDescriptor(JvmManglerDesc()) - val (moduleFragment, symbolTable, sourceManager) = + val (moduleFragment, symbolTable, sourceManager, components) = Fir2IrConverter.createModuleFragment( session, resolveTransformer.scopeSession, firFiles, moduleConfiguration.languageVersionSettings, signaturer = signaturer, @@ -370,6 +371,8 @@ object KotlinToJVMBytecodeCompiler { createOutputFilesFlushingCallbackIfPossible(moduleConfiguration) ).isIrBackend( true + ).jvmBackendClassResolver( + FirJvmBackendClassResolver(components) ).build() ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()