From 3a60b30dae3af3e2b25d341975e1f95df2c9b5eb Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Fri, 31 Mar 2023 23:13:52 +0200 Subject: [PATCH] Minor: IrActualizationResult -> IrActualizedResult --- .../kotlin/cli/js/klib/compilerPipeline.kt | 2 +- .../jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt | 4 ++-- .../cli/jvm/compiler/pipeline/compilerPipeline.kt | 6 +++--- .../jvm/compiler/pipeline/compilerPipelineData.kt | 4 ++-- .../jetbrains/kotlin/fir/pipeline/convertToIr.kt | 6 +++--- .../fir/backend/jvm/FirJvmBackendExtension.kt | 6 +++--- .../fir/backend/jvm/FirMetadataSerializer.kt | 14 +++++++------- .../kotlin/fir/backend/ConversionUtils.kt | 6 +++--- .../incremental/IncrementalFirJvmCompilerRunner.kt | 4 ++-- .../kotlin/incremental/incrementalFirCacheUtils.kt | 2 +- .../backend/common/actualizer/IrActualizer.kt | 6 +++--- .../kotlin/test/backend/ir/IrBackendInput.kt | 4 ++-- .../test/frontend/fir/Fir2IrJsResultsConverter.kt | 6 +++--- .../test/frontend/fir/Fir2IrResultsConverter.kt | 2 +- .../jetbrains/kotlin/codegen/GenerationUtils.kt | 2 +- .../js/test/converters/FirJsKlibBackendFacade.kt | 4 ++-- .../org/jetbrains/kotlin/backend/konan/Fir2Ir.kt | 4 ++-- .../kotlin/backend/konan/FirNativeSerializer.kt | 2 +- .../kotlin/backend/konan/driver/phases/Fir2Ir.kt | 4 ++-- 19 files changed, 44 insertions(+), 44 deletions(-) diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/compilerPipeline.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/compilerPipeline.kt index 67104a50c3d..afbcca72dbc 100644 --- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/compilerPipeline.kt +++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/compilerPipeline.kt @@ -167,7 +167,7 @@ fun serializeFirKlib( val metadataVersion = moduleStructure.compilerConfiguration.metadataVersion() - val actualizedExpectDeclarations = fir2IrActualizedResult.irActualizationResult.extractFirDeclarations() + val actualizedExpectDeclarations = fir2IrActualizedResult.irActualizedResult.extractFirDeclarations() serializeModuleIntoKlib( moduleStructure.compilerConfiguration[CommonConfigurationKeys.MODULE_NAME]!!, 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 ef1acd21f06..6cf0d56a26a 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 @@ -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() diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt index 75e9f4b0157..31c0085c685 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt @@ -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() diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt index 294f91efb02..e942791f9e5 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipelineData.kt @@ -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? ) diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/convertToIr.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/convertToIr.kt index d3bc6c610e7..104be8ddebd 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/convertToIr.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/convertToIr.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.pipeline -import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult +import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult import org.jetbrains.kotlin.backend.common.actualizer.IrActualizer import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor @@ -41,7 +41,7 @@ data class Fir2IrActualizedResult( val irModuleFragment: IrModuleFragment, val components: Fir2IrComponents, val pluginContext: Fir2IrPluginContext, - val irActualizationResult: IrActualizationResult?, + val irActualizedResult: IrActualizedResult?, ) fun FirResult.convertToIrAndActualizeForJvm( @@ -77,7 +77,7 @@ fun FirResult.convertToIrAndActualize( fir2IrResultPostCompute: Fir2IrResult.() -> Unit = {}, ): Fir2IrActualizedResult { val fir2IrResult: Fir2IrResult - val actualizationResult: IrActualizationResult? + val actualizationResult: IrActualizedResult? val commonMemberStorage = Fir2IrCommonMemberStorage( generateSignatures = linkViaSignatures, diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt index 4ab36ef8566..17f08ca01e2 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.backend.jvm -import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult +import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmBackendExtension import org.jetbrains.kotlin.backend.jvm.metadata.MetadataSerializer @@ -18,7 +18,7 @@ import org.jetbrains.org.objectweb.asm.Type class FirJvmBackendExtension( private val components: Fir2IrComponents, - private val irActualizationResult: IrActualizationResult? + private val irActualizedResult: IrActualizedResult? ) : JvmBackendExtension { override fun createSerializer( context: JvmBackendContext, @@ -34,7 +34,7 @@ class FirJvmBackendExtension( bindings, components, parentSerializer, - irActualizationResult + irActualizedResult ) } diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt index 40585cb47cc..5907958e45e 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirMetadataSerializer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.backend.jvm -import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult +import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.backend.jvm.metadata.MetadataSerializer @@ -50,7 +50,7 @@ fun makeFirMetadataSerializerForIrClass( serializationBindings: JvmSerializationBindings, components: Fir2IrComponents, parent: MetadataSerializer?, - irActualizationResult: IrActualizationResult? + irActualizedResult: IrActualizedResult? ): FirMetadataSerializer { val approximator = TypeApproximatorForMetadataSerializer(session) val localDelegatedProperties = context.localDelegatedProperties[irClass.attributeOwnerId]?.map { @@ -69,7 +69,7 @@ fun makeFirMetadataSerializerForIrClass( irClass.metadata, components.session, components.scopeSession, firSerializerExtension, approximator, parent, context.state.configuration.languageVersionSettings, ), - irActualizationResult + irActualizedResult ) } @@ -82,7 +82,7 @@ fun makeLocalFirMetadataSerializerForMetadataSource( parent: MetadataSerializer?, targetId: TargetId, configuration: CompilerConfiguration, - irActualizationResult: IrActualizationResult? + irActualizedResult: IrActualizedResult? ): FirMetadataSerializer { val serializationBindings = JvmSerializationBindings() val approximator = TypeApproximatorForMetadataSerializer(session) @@ -116,7 +116,7 @@ fun makeLocalFirMetadataSerializerForMetadataSource( metadata, session, scopeSession, firSerializerExtension, approximator, parent, configuration.languageVersionSettings ), - irActualizationResult + irActualizedResult ) } @@ -126,9 +126,9 @@ class FirMetadataSerializer( private val serializerExtension: FirJvmSerializerExtension, private val approximator: AbstractTypeApproximator, internal val serializer: FirElementSerializer?, - irActualizationResult: IrActualizationResult? + irActualizedResult: IrActualizedResult? ) : MetadataSerializer { - private val actualizedExpectDeclarations = irActualizationResult.extractFirDeclarations() + private val actualizedExpectDeclarations = irActualizedResult.extractFirDeclarations() override fun serialize(metadata: MetadataSource): Pair? { val message = when (metadata) { diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt index 1c91ab3482b..507df83726d 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.backend import com.intellij.psi.PsiCompiledElement import org.jetbrains.kotlin.* -import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult +import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult import org.jetbrains.kotlin.builtins.StandardNames.DATA_CLASS_COMPONENT_PREFIX import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.diagnostics.startOffsetSkippingComments @@ -757,6 +757,6 @@ fun FirCallableDeclaration.contextReceiversForFunctionOrContainingProperty(): Li else this.contextReceivers -fun IrActualizationResult?.extractFirDeclarations(): Set? { +fun IrActualizedResult?.extractFirDeclarations(): Set? { return this?.actualizedExpectDeclarations?.mapNotNullTo(mutableSetOf()) { ((it as IrMetadataSourceOwner).metadata as FirMetadataSource).fir } -} +} \ No newline at end of file diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt index aa002fec30f..e27d6978eaf 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt @@ -275,7 +275,7 @@ class IncrementalFirJvmCompilerRunner( val extensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler) val irGenerationExtensions = (projectEnvironment as? VfsBasedProjectEnvironment)?.project?.let { IrGenerationExtension.getInstances(it) }.orEmpty() - val (irModuleFragment, components, pluginContext, irActualizationResult) = cycleResult.convertToIrAndActualizeForJvm( + val (irModuleFragment, components, pluginContext, irActualizedResult) = cycleResult.convertToIrAndActualizeForJvm( extensions, irGenerationExtensions, linkViaSignatures = false, @@ -292,7 +292,7 @@ class IncrementalFirJvmCompilerRunner( irModuleFragment, components, pluginContext, - irActualizationResult + irActualizedResult ) val codegenOutput = generateCodeFromIr(irInput, compilerEnvironment, performanceManager) diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/incrementalFirCacheUtils.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/incrementalFirCacheUtils.kt index f212bae59ec..993fc13b67e 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/incrementalFirCacheUtils.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/incrementalFirCacheUtils.kt @@ -53,7 +53,7 @@ internal fun collectNewDirtySources( data.lastOrNull(), targetId, configuration, - irActualizationResult = null + irActualizedResult = null ) data.push(serializer) body(serializer) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrActualizer.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrActualizer.kt index be3dacfc7b1..4810deeb44a 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrActualizer.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrActualizer.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.util.DeepCopyTypeRemapper -data class IrActualizationResult(val actualizedExpectDeclarations: List) +data class IrActualizedResult(val actualizedExpectDeclarations: List) object IrActualizer { fun actualize( @@ -20,7 +20,7 @@ object IrActualizer { dependentFragments: List, diagnosticReporter: DiagnosticReporter, languageVersionSettings: LanguageVersionSettings - ): IrActualizationResult { + ): IrActualizedResult { val ktDiagnosticReporter = KtDiagnosticReporterWithImplicitIrBasedContext(diagnosticReporter, languageVersionSettings) val (expectActualMap, expectActualTypeAliasMap) = ExpectActualCollector( @@ -47,7 +47,7 @@ object IrActualizer { mergeIrFragments(mainFragment, dependentFragments) - return IrActualizationResult(removedExpectDeclarations) + return IrActualizedResult(removedExpectDeclarations) } private fun removeExpectDeclarations(dependentFragments: List, expectActualMap: Map): List { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt index c400b9c46d0..c6d38153acf 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.test.backend.ir import org.jetbrains.kotlin.KtSourceFile -import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult +import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory import org.jetbrains.kotlin.codegen.state.GenerationState @@ -40,7 +40,7 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput() { val expectDescriptorToSymbol: MutableMap, // TODO: abstract from descriptors val diagnosticsCollector: BaseDiagnosticsCollector, val hasErrors: Boolean, - val serializeSingleFile: (KtSourceFile, IrActualizationResult?) -> ProtoBuf.PackageFragment + val serializeSingleFile: (KtSourceFile, IrActualizedResult?) -> ProtoBuf.PackageFragment ) : IrBackendInput() { override val irModuleFragment: IrModuleFragment get() = mainModuleFragment diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt index 02c7aebef50..dfec5e308ad 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt @@ -111,11 +111,11 @@ class Fir2IrJsResultsConverter( expectDescriptorToSymbol = mutableMapOf(), diagnosticsCollector = DiagnosticReporterFactory.createReporter(), hasErrors = inputArtifact.hasErrors - ) { file, irActualizationResult -> + ) { file, irActualizedResult -> val (firFile, components) = firFilesAndComponentsBySourceFile[file] ?: error("cannot find FIR file by source file ${file.name} (${file.path})") - if (actualizedExpectDeclarations == null && irActualizationResult != null) { - actualizedExpectDeclarations = irActualizationResult.extractFirDeclarations() + if (actualizedExpectDeclarations == null && irActualizedResult != null) { + actualizedExpectDeclarations = irActualizedResult.extractFirDeclarations() } serializeSingleFirFile( firFile, diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt index 20e03b3e639..307ba96decd 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt @@ -108,7 +108,7 @@ class Fir2IrResultsConverter( phaseConfig, components.irProviders, fir2IrExtensions, - FirJvmBackendExtension(components, irActualizationResult = null), + FirJvmBackendExtension(components, irActualizedResult = null), pluginContext, notifyCodegenStart = {}, ) diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt index cce1ce1a094..7f1e7169121 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt @@ -160,7 +160,7 @@ object GenerationUtils { generationState.oldBEInitTrace(files) codegenFactory.generateModuleInFrontendIRMode( generationState, moduleFragment, components.symbolTable, components.irProviders, - fir2IrExtensions, FirJvmBackendExtension(components, irActualizationResult = null), pluginContext, + fir2IrExtensions, FirJvmBackendExtension(components, irActualizedResult = null), pluginContext, ) {} generationState.factory.done() diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt index eb0d360a394..a302f51b829 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/FirJsKlibBackendFacade.kt @@ -65,7 +65,7 @@ class FirJsKlibBackendFacade( val diagnosticReporter = DiagnosticReporterFactory.createReporter() if (firstTimeCompilation) { - val irActualizationResult = + val irActualizedResult = if (module.frontendKind == FrontendKinds.FIR && module.languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects)) { IrActualizer.actualize( inputArtifact.mainModuleFragment, @@ -93,7 +93,7 @@ class FirJsKlibBackendFacade( abiVersion = KotlinAbiVersion.CURRENT, // TODO get from test file data jsOutputName = null ) { - inputArtifact.serializeSingleFile(it, irActualizationResult) + inputArtifact.serializeSingleFile(it, irActualizedResult) } } diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt index 4ed4f031561..679ba8833c4 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Fir2Ir.kt @@ -70,7 +70,7 @@ internal fun PhaseContext.fir2Ir( } val diagnosticsReporter = DiagnosticReporterFactory.createPendingReporter() - val (irModuleFragment, components, pluginContext, irActualizationResult) = input.firResult.convertToIrAndActualize( + val (irModuleFragment, components, pluginContext, irActualizedResult) = input.firResult.convertToIrAndActualize( fir2IrExtensions, IrGenerationExtension.getInstances(config.project), linkViaSignatures = false, @@ -120,7 +120,7 @@ internal fun PhaseContext.fir2Ir( throw KonanCompilationException("Compilation failed: there were some diagnostics during fir2ir") } - return Fir2IrOutput(input.firResult, symbols, irModuleFragment, components, pluginContext, irActualizationResult, usedLibraries) + return Fir2IrOutput(input.firResult, symbols, irModuleFragment, components, pluginContext, irActualizedResult, usedLibraries) } private fun PhaseContext.createKonanSymbols( diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt index d9b8bac6c47..9de9a0184c1 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/FirNativeSerializer.kt @@ -49,7 +49,7 @@ internal fun PhaseContext.firSerializer( val usedResolvedLibraries = resolvedLibraries.filter { (!it.isDefault && !configuration.getBoolean(KonanConfigKeys.PURGE_USER_LIBS)) || it in input.usedLibraries } - val actualizedFirDeclarations = input.irActualizationResult.extractFirDeclarations() + val actualizedFirDeclarations = input.irActualizedResult.extractFirDeclarations() return serializeNativeModule( configuration = configuration, messageLogger = configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None, diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/Fir2Ir.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/Fir2Ir.kt index d2b650824a3..e877fa8c6b9 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/Fir2Ir.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/Fir2Ir.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.backend.konan.driver.phases -import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult +import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult import org.jetbrains.kotlin.backend.konan.driver.PhaseContext import org.jetbrains.kotlin.backend.konan.driver.PhaseEngine import org.jetbrains.kotlin.backend.konan.fir2Ir @@ -22,7 +22,7 @@ internal data class Fir2IrOutput( val irModuleFragment: IrModuleFragment, val components: Fir2IrComponents, val pluginContext: Fir2IrPluginContext, - val irActualizationResult: IrActualizationResult?, + val irActualizedResult: IrActualizedResult?, val usedLibraries: Set )