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

[FIR] Add forgotten FirJvmBackendClassResolver to CLI

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-05-28 10:54:15 +03:00
parent 0ed9356cd2
commit 048e7a7075
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+4 -1
View File
@@ -55,6 +55,7 @@ import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.backend.Fir2IrConverter 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.backend.jvm.FirJvmClassCodegen
import org.jetbrains.kotlin.fir.builder.RawFirBuilder import org.jetbrains.kotlin.fir.builder.RawFirBuilder
import org.jetbrains.kotlin.fir.extensions.BunchOfRegisteredExtensions import org.jetbrains.kotlin.fir.extensions.BunchOfRegisteredExtensions
@@ -349,7 +350,7 @@ object KotlinToJVMBytecodeCompiler {
val signaturer = IdSignatureDescriptor(JvmManglerDesc()) val signaturer = IdSignatureDescriptor(JvmManglerDesc())
val (moduleFragment, symbolTable, sourceManager) = val (moduleFragment, symbolTable, sourceManager, components) =
Fir2IrConverter.createModuleFragment( Fir2IrConverter.createModuleFragment(
session, resolveTransformer.scopeSession, firFiles, session, resolveTransformer.scopeSession, firFiles,
moduleConfiguration.languageVersionSettings, signaturer = signaturer, moduleConfiguration.languageVersionSettings, signaturer = signaturer,
@@ -370,6 +371,8 @@ object KotlinToJVMBytecodeCompiler {
createOutputFilesFlushingCallbackIfPossible(moduleConfiguration) createOutputFilesFlushingCallbackIfPossible(moduleConfiguration)
).isIrBackend( ).isIrBackend(
true true
).jvmBackendClassResolver(
FirJvmBackendClassResolver(components)
).build() ).build()
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled() ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()