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

[IR] Avoid depending from fir2ir on ir.actualization module

Browse Source 
^KT-62292
This commit is contained in:
Pavel Kunyavskiy
2023-11-14 14:26:04 +01:00
committed by Space Team
parent cf6792ec65
commit 021a00f4ff
17 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+3 -1
View File
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys.LOOKUP_TRACKER
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
import org.jetbrains.kotlin.fir.backend.extractFirDeclarations
import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver
import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendExtension
import org.jetbrains.kotlin.fir.backend.jvm.JvmFir2IrExtensions
@@ -188,7 +189,8 @@ object KotlinToJVMBytecodeCompiler {
NoScopeRecordCliBindingTrace().bindingContext,
FirJvmBackendClassResolver(fir2IrAndIrActualizerResult.components),
FirJvmBackendExtension(
fir2IrAndIrActualizerResult.components, fir2IrAndIrActualizerResult.irActualizedResult
fir2IrAndIrActualizerResult.components,
fir2IrAndIrActualizerResult.irActualizedResult?.actualizedExpectDeclarations?.extractFirDeclarations()
)
)
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
+5 -1
View File
@@ -47,6 +47,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
import org.jetbrains.kotlin.fir.backend.Fir2IrConfiguration
import org.jetbrains.kotlin.fir.backend.Fir2IrExtensions
import org.jetbrains.kotlin.fir.backend.extractFirDeclarations
import org.jetbrains.kotlin.fir.backend.jvm.*
import org.jetbrains.kotlin.fir.extensions.FirAnalysisHandlerExtension
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
@@ -262,7 +263,10 @@ fun generateCodeFromIr(
input.components.symbolTable,
input.components.irProviders,
input.extensions,
FirJvmBackendExtension(input.components, input.irActualizedResult),
FirJvmBackendExtension(
input.components,
input.irActualizedResult?.actualizedExpectDeclarations?.extractFirDeclarations()
),
input.pluginContext
) {
performanceManager?.notifyIRLoweringFinished()