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

Minor: IrActualizationResult -> IrActualizedResult

Browse Source
This commit is contained in:
Ivan Kochurkin
2023-03-31 23:13:52 +02:00
committed by Space Team
parent b7bb9c317f
commit 3a60b30dae
19 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt
+2 -2
View File
@@ -223,7 +223,7 @@ object FirKotlinToJvmBytecodeCompiler {
extensions: JvmGeneratorExtensions,
diagnosticsReporter: BaseDiagnosticsCollector
): GenerationState {
val (moduleFragment, components, pluginContext, irActualizationResult) = fir2IrActualizedResult
val (moduleFragment, components, pluginContext, irActualizedResult) = fir2IrActualizedResult
val dummyBindingContext = NoScopeRecordCliBindingTrace().bindingContext
val codegenFactory = JvmIrCodegenFactory(
moduleConfiguration,
@@ -252,7 +252,7 @@ object FirKotlinToJvmBytecodeCompiler {
generationState.oldBEInitTrace(ktFiles)
codegenFactory.generateModuleInFrontendIRMode(
generationState, moduleFragment, components.symbolTable, components.irProviders,
extensions, FirJvmBackendExtension(components, irActualizationResult), pluginContext
extensions, FirJvmBackendExtension(components, irActualizedResult), pluginContext
) {
performanceManager?.notifyIRLoweringFinished()
performanceManager?.notifyIRGenerationStarted()
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
+3 -3
View File
@@ -231,7 +231,7 @@ fun convertAnalyzedFirToIr(
IrGenerationExtension.getInstances(it)
} ?: emptyList()
val linkViaSignatures = input.configuration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES)
val (irModuleFragment, components, pluginContext, irActualizationResult) =
val (irModuleFragment, components, pluginContext, irActualizedResult) =
analysisResults.convertToIrAndActualizeForJvm(
extensions, irGenerationExtensions, linkViaSignatures,
environment.diagnosticsReporter, input.configuration.languageVersionSettings
@@ -244,7 +244,7 @@ fun convertAnalyzedFirToIr(
irModuleFragment,
components,
pluginContext,
irActualizationResult
irActualizedResult
)
}
@@ -288,7 +288,7 @@ fun generateCodeFromIr(
input.components.symbolTable,
input.components.irProviders,
input.extensions,
FirJvmBackendExtension(input.components, input.irActualizationResult),
FirJvmBackendExtension(input.components, input.irActualizedResult),
input.pluginContext
) {
performanceManager?.notifyIRLoweringFinished()
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.cli.jvm.compiler.pipeline
import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult
import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
@@ -45,5 +45,5 @@ data class ModuleCompilerIrBackendInput(
val irModuleFragment: IrModuleFragment,
val components: Fir2IrComponents,
val pluginContext: Fir2IrPluginContext,
val irActualizationResult: IrActualizationResult?
val irActualizedResult: IrActualizedResult?
)